version 1.12.0

Changelog - CMake support - Fix iOS build - Fix AVPacket memory leak - Geometry & GeometryRenderer class is public - PAL8, XYZ color format support - Fix OpenGL background color - Fix external clock error after pause - VA-API encoder support (ffmpeg>=3) - Other improvements, fixes, and untested features
JxLiu2016 · Jun 21, 2017 · f672e4a · f672e4a
1 parent cd2e79e
commit f672e4a
Show file tree

Hide file tree

Showing 27 changed files with 298 additions and 36 deletions.
diff --git a/.qmake.conf b/.qmake.conf
@@ -1,5  1,5 @@
 QTAV_MAJOR_VERSION = 1
-QTAV_MINOR_VERSION = 11
 QTAV_MINOR_VERSION = 12
 QTAV_PATCH_VERSION = 0
 
 QTAV_VERSION = $${QTAV_MAJOR_VERSION}.$${QTAV_MINOR_VERSION}.$${QTAV_PATCH_VERSION}

diff --git a/Changelog b/Changelog
@@ -1,3  1,16 @@
 version 1.12.0 2017-06-20
 
 Changelog
 - CMake support
 - Fix iOS build
 - Fix AVPacket memory leak
 - Geometry & GeometryRenderer class is public
 - PAL8, XYZ color format support
 - Fix OpenGL background color
 - Fix external clock error after pause
 - VA-API encoder support (ffmpeg>=3)
 - Other improvements, fixes, and untested features
 
 version 1.11.0 2016-06-19
 
 Changelog

diff --git a/common.pri b/common.pri
@@ -32,7  32,7 @@ isEmpty(QMAKE_EXTENSION_SHLIB) {
 
 CONFIG  = profile
 #profiling, -pg is not supported for msvc
-debug:!android:!*msvc*:profile {
 debug:!ios:!android:!*msvc*:profile {
 	QMAKE_CXXFLAGS_DEBUG  = -pg
 	QMAKE_LFLAGS_DEBUG  = -pg
 	QMAKE_CXXFLAGS_DEBUG = $$unique(QMAKE_CXXFLAGS_DEBUG)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3  1,17 @@
 qtav (1.12.0) unstable; urgency=low
 
   * CMake support
   * Fix iOS build
   * Fix AVPacket memory leak
   * Geometry & GeometryRenderer class is public
   * PAL8, XYZ color format support
   * Fix OpenGL background color
   * Fix external clock error after pause
   * VA-API encoder support (ffmpeg>=3)
   * Other improvements, fixes, and untested features
 
  -- Wang Bin (Lucas) <[email protected]>  Tue, 20 Jun 2017 20:44:14  0800
 
 qtav (1.11.0) unstable; urgency=low
 
   * Dynamic load QtAVWidgets in VideoOutput. avwidgets module is not requred now.

diff --git a/debian/ubuntu.sh b/debian/ubuntu.sh
@@ -19,7  19,7 @@ for D in ${DISTRIBUTIONS[@]}; do
   git checkout -- debian/changelog debian/control
   cp -avf debian/control $CONTROL_BAK
   cp -avf debian/changelog $CHANGELOG_BAK
-  VER=1.11.0~`git log -1 --pretty=format:"git${DATE}.%h~${D}" 2> /dev/null`
   VER=1.12.0~`git log -1 --pretty=format:"git${DATE}.%h~${D}" 2> /dev/null`
   mkchangelog $VER $D
   if [ $idx -gt 3 ]; then
     sed -i 's,qtdeclarative5-controls-plugin,qml-module-qtquick-controls,g' debian/control

diff --git a/examples/QMLPlayer/QMLPlayer_sdk.pro b/examples/QMLPlayer/QMLPlayer_sdk.pro
@@ -56,7  56,7 @@ defineTest(genRC) {
     RC_ICONS = $$PROJECTROOT/src/QtAV.ico
     QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
     QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia playback framework. http://qtav.org"
-    QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
     QMAKE_TARGET_PRODUCT = "QtAV $$1"
     export(RC_ICONS)
     export(QMAKE_TARGET_COMPANY)

diff --git a/examples/QMLPlayer/android/AndroidManifest.xml b/examples/QMLPlayer/android/AndroidManifest.xml
@@ -1,5  1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.qtav.qmlplayer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.11.0" android:versionCode="7" android:installLocation="auto">
 <manifest package="org.qtav.qmlplayer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.12.0" android:versionCode="7" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="QMLPlayer" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtav.qmlplayer.QMLPlayerActivity" android:label="QtAV QMLPlayer" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>

diff --git a/examples/QMLPlayer/ios/Info.plist b/examples/QMLPlayer/ios/Info.plist
@@ -19,9  19,9 @@
 	<key>CFBundleName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleShortVersionString</key>
-        <string>1.11</string>
         <string>1.12</string>
 	<key>CFBundleVersion</key>
-        <string>1.11.0</string>
         <string>1.12.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>

diff --git a/examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest b/examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest
@@ -4,7  4,7 @@
     Name=\"org.qtav.qmlplayer\"
     ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\"
     Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
-    Version=\"1.11.0.0\" />
     Version=\"1.12.0.0\" />
   <mp:PhoneIdentity
     PhoneProductId=\"e556656c-d8e8-49f9-8148-26506e94575a\"
     PhonePublisherId=\"00000000-0000-0000-0000-000000000000\" />

diff --git a/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest b/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest
@@ -10,7  10,7 @@
   <Identity
     Name=\"org.qtav.qmlplayer\"
     Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
-    Version=\"1.11.0.0\"
     Version=\"1.12.0.0\"
     ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\" /> <!--replaced by qmake-->
   <mp:PhoneIdentity
     PhoneProductId=\"e556656c-d8e8-49f9-8148-26506e94575a\"

diff --git a/examples/QMLPlayer/winrt/WinRT8.Package.appxmanifest b/examples/QMLPlayer/winrt/WinRT8.Package.appxmanifest
@@ -4,7  4,7 @@
     Name=\"org.qtav.qmlplayer\"
     ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\"
     Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
-    Version=\"1.11.0.0\" />
     Version=\"1.12.0.0\" />
   <Properties>
     <DisplayName>QtAV Video Player</DisplayName>
     <PublisherDisplayName>Lucas Wang</PublisherDisplayName>

diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri
@@ -152,7  152,7 @@ defineTest(genRC) {
     RC_ICONS = $$PROJECTROOT/src/QtAV.ico
     QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
     QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org"
-    QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
     QMAKE_TARGET_PRODUCT = "QtAV $$1"
     export(RC_ICONS)
     export(QMAKE_TARGET_COMPANY)

diff --git a/examples/player/ios/Info.plist b/examples/player/ios/Info.plist
@@ -0,0  1,231 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
         <string>Created by Wang Bin</string>
 	<key>CFBundleSignature</key>
         <string>????</string>
 	<key>CFBundleExecutable</key>
         <string>Player</string>
 	<key>CFBundleIdentifier</key>
         <string>org.qtav.player</string>
 	<key>CFBundleDisplayName</key>
         <string>QtAV Player</string>
 	<key>CFBundleName</key>
         <string>QtAV Player</string>
 	<key>CFBundleShortVersionString</key>
         <string>1.12</string>
 	<key>CFBundleVersion</key>
         <string>1.12.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>
 	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>NOTE</key>
 	<string>This file was generated by Qt/QMake.</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>AAC</string>
 				<string>AC3</string>
 				<string>AIFF</string>
 				<string>M4A</string>
 				<string>MKA</string>
 				<string>MP3</string>
 				<string>OGG</string>
 				<string>PCM</string>
 				<string>VAW</string>
 				<string>WAV</string>
 				<string>WAW</string>
 				<string>WMA</string>
 				<string>aac</string>
 				<string>ac3</string>
 				<string>aiff</string>
 				<string>m4a</string>
 				<string>mka</string>
 				<string>mp3</string>
 				<string>ogg</string>
 				<string>pcm</string>
 				<string>vaw</string>
 				<string>wav</string>
 				<string>waw</string>
 				<string>wma</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>document.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Audio file</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
 			<key>NSPersistentStoreTypeKey</key>
 			<string>XML</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>*</string>
 				<string>*</string>
 				<string>3GP</string>
 				<string>3IV</string>
 				<string>3gp</string>
 				<string>3iv</string>
 				<string>ASF</string>
 				<string>AVI</string>
 				<string>CPK</string>
 				<string>DAT</string>
 				<string>DIVX</string>
 				<string>DV</string>
 				<string>FLAC</string>
 				<string>FLI</string>
 				<string>FLV</string>
 				<string>H264</string>
 				<string>I263</string>
 				<string>M2TS</string>
 				<string>M4V</string>
 				<string>MKV</string>
 				<string>MOV</string>
 				<string>MP2</string>
 				<string>MP4</string>
 				<string>MPEG</string>
 				<string>MPG</string>
 				<string>MPG2</string>
 				<string>MPG4</string>
 				<string>NSV</string>
 				<string>NUT</string>
 				<string>NUV</string>
 				<string>OGG</string>
 				<string>OGM</string>
 				<string>QT</string>
 				<string>RM</string>
 				<string>RMVB</string>
 				<string>VCD</string>
 				<string>VFW</string>
 				<string>VOB</string>
 				<string>WEBM</string>
 				<string>WMV</string>
 				<string>asf</string>
 				<string>avi</string>
 				<string>cpk</string>
 				<string>dat</string>
 				<string>divx</string>
 				<string>dv</string>
 				<string>flac</string>
 				<string>fli</string>
 				<string>flv</string>
 				<string>h264</string>
 				<string>i263</string>
 				<string>m2ts</string>
 				<string>m4v</string>
 				<string>mkv</string>
 				<string>mov</string>
 				<string>mp2</string>
 				<string>mp4</string>
 				<string>mpeg</string>
 				<string>mpg</string>
 				<string>mpg2</string>
 				<string>mpg4</string>
 				<string>mts</string>
 				<string>nsv</string>
 				<string>nut</string>
 				<string>nuv</string>
 				<string>ogg</string>
 				<string>ogm</string>
 				<string>qt</string>
 				<string>rm</string>
 				<string>rmvb</string>
 				<string>vcd</string>
 				<string>vfw</string>
 				<string>vob</string>
 				<string>webm</string>
 				<string>wmv</string>
 				<string>f4v</string>
 				<string>ts</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>document.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Movie file</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
 			<key>NSPersistentStoreTypeKey</key>
 			<string>XML</string>
 		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>
 				<string>AQT</string>
 				<string>ASS</string>
 				<string>JSS</string>
 				<string>RT</string>
 				<string>SMI</string>
 				<string>SRT</string>
 				<string>SSA</string>
 				<string>SUB</string>
 				<string>TXT</string>
 				<string>UTF</string>
 				<string>aqt</string>
 				<string>ass</string>
 				<string>jss</string>
 				<string>rt</string>
 				<string>smi</string>
 				<string>srt</string>
 				<string>ssa</string>
 				<string>sub</string>
 				<string>txt</string>
 				<string>utf</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
 			<string>document.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>Subtitles file</string>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>LSTypeIsPackage</key>
 			<false/>
 			<key>NSPersistentStoreTypeKey</key>
 			<string>XML</string>
 		</dict>
 	</array>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 			<key>CFBundleURLName</key>
 			<string>Streaming Protocol</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>mms</string>
 				<string>mmst</string>
 				<string>http</string>
 				<string>httpproxy</string>
 				<string>rtp</string>
 				<string>rtsp</string>
 				<string>ftp</string>
 				<string>udp</string>
 				<string>smb</string>
 			</array>
 		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/examples/player/player_sdk.pro b/examples/player/player_sdk.pro
@@ -1,4  1,5 @@
-QT  = sql
 TARGET = Player
 QT  = sql svg
 ########## template for QtAV app project BEGIN ################
 greaterThan(QT_MAJOR_VERSION, 4) {
   QT  = avwidgets
@@ -22,11  23,15 @@ RESOURCES  = $$COMMON/theme/theme.qrc
 isEmpty(PROJECTROOT): PROJECTROOT = $$PWD/../..
 mac: RC_FILE = $$PROJECTROOT/src/QtAV.icns
 QMAKE_INFO_PLIST = $$COMMON/Info.plist
 ios: QMAKE_INFO_PLIST = ios/Info.plist
 videos.files = video
 videos.path = /
 QMAKE_BUNDLE_DATA  = videos
 defineTest(genRC) {
     RC_ICONS = $$PROJECTROOT/src/QtAV.ico
     QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
     QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org"
-    QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
     QMAKE_TARGET_PRODUCT = "QtAV $$1"
     export(RC_ICONS)
     export(QMAKE_TARGET_COMPANY)

diff --git a/qml/libQmlAV.pro b/qml/libQmlAV.pro
@@ -65,7  65,7 @@ EXTRA_COPY_FILES = $$qtav_qml.files
 QMAKE_WRITE_DEFAULT_RC = 1
 QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
 QMAKE_TARGET_DESCRIPTION = "QtAV QML module. QtAV Multimedia framework. http://qtav.org"
-QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
 QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
 QMAKE_TARGET_PRODUCT = "QtAV QML"
 
 SOURCES  = \

diff --git a/qtc_packaging/ifw/build.sh b/qtc_packaging/ifw/build.sh
@@ -203,7  203,7 @@ cd -
 
 ### player
 echo "coping player files..."
-mv $RT_DIR/data/bin/{player${EXE},QMLPlayer${EXE}} $TARGET/packages/com.qtav.product.player/data/bin
 mv $RT_DIR/data/bin/{Player${EXE},QMLPlayer${EXE}} $TARGET/packages/com.qtav.product.player/data/bin
 
 ### examples
 echo "coping examples..."