release 1.13.0

- add python bindings - more apis for qml player - auto rotate video - apple store - fix ios plugin not found - support chapters - muxer, encoder, transcoder improvements - compatible with new ffmpeg - videotoolbox: hevc, - cuda: new devices - android: no longer depends on private qt module - fix opensl error - mediacodec: 0-copy via a plugin from https://github.com/wang-bin/mdk-sdk
Megidd · Jul 11, 2019 · b51fee7 · b51fee7
1 parent f30128c
commit b51fee7
Show file tree

Hide file tree

Showing 26 changed files with 72 additions and 39 deletions.
diff --git a/.qmake.conf b/.qmake.conf
@@ -1,5  1,5 @@
 QTAV_MAJOR_VERSION = 1
-QTAV_MINOR_VERSION = 12
 QTAV_MINOR_VERSION = 13
 QTAV_PATCH_VERSION = 0
 
 QTAV_VERSION = $${QTAV_MAJOR_VERSION}.$${QTAV_MINOR_VERSION}.$${QTAV_PATCH_VERSION}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7  3,7 @@ cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
 project(QTAV)
 
 set(QTAV_MAJOR 1)
-set(QTAV_MINOR 12)
 set(QTAV_MINOR 13)
 set(QTAV_PATCH 0)
 set(PROJECT_VERSION ${QTAV_MAJOR}.${QTAV_MINOR}.${QTAV_PATCH})
 set(SO_VERSION ${QTAV_MAJOR})

diff --git a/Changelog b/Changelog
@@ -1,3  1,20 @@
 version 1.13.0 2019-07-11
 
 - add python bindings
 - more apis for qml player
 - auto rotate video
 - apple store
 - fix ios plugin not found
 - support chapters
 - muxer, encoder, transcoder improvements
 - compatible with new ffmpeg
 - videotoolbox: hevc,
 - cuda: new devices
 - android: no longer depends on private qt module
 - fix opensl error
 - mediacodec: 0-copy via a plugin from https://github.com/wang-bin/mdk-sdk
 
 
 version 1.12.0 2017-06-20
 
 Changelog

diff --git a/README.md b/README.md
@@ -155,6  155,4 @@ Use QtAV in QML with OpenGL shaders(example is from qtmultimedia. But qtmultimed
 
 > Copyright &copy; Wang Bin [email protected]
 
-> Shanghai University->S3 Graphics->Deepin, Shanghai, China
-
 > 2013-01-21
diff --git a/cmake/QtAV.rc.in b/cmake/QtAV.rc.in
@@ -19,10  19,10 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Shanghai University->S3 Graphics->Deepin->PPTV | [email protected]"
             VALUE "CompanyName", "[email protected]"
             VALUE "FileDescription", "QtAV Multimedia framework. http://qtav.org"
             VALUE "FileVersion", QTAV_VERSION_STR ".0"
-            VALUE "LegalCopyright", "Copyright (C) 2012-2017 WangBin, [email protected]"
             VALUE "LegalCopyright", "Copyright (C) 2012-2019 WangBin, [email protected]"
             VALUE "InternalName", "@MODULE@"
             VALUE "ProductName", "@MODULE@"
             VALUE "ProductVersion", QTAV_VERSION_STR ".0"

diff --git a/debian/changelog b/debian/changelog
@@ -1,3  1,21 @@
 qtav (1.13.0) unstable; urgency=low
 
   * Add python bindings
   * More apis for qml player
   * Auto rotate video
   * Apple store
   * Fix ios plugin not found
   * Support chapters
   * Muxer, encoder, transcoder improvements
   * Compatible with new ffmpeg
   * Videotoolbox: hevc
   * Cuda: new devices
   * Android: no longer depends on private qt module
   * Fix opensl error
   * Other improvements, fixes, and untested features
 
  -- Wang Bin (Lucas) <[email protected]>  Thu, 11 Jul 2019 08:53:50  0800
 
 qtav (1.12.0) unstable; urgency=low
 
   * CMake support

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-2017 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 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.12.1" android:versionCode="9" android:installLocation="auto">
 <manifest package="org.qtav.qmlplayer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.13.0" android:versionCode="16" 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.12</string>
         <string>1.13</string>
 	<key>CFBundleVersion</key>
-        <string>1.12.0</string>
         <string>1.13.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.12.0.0\" />
     Version=\"1.13.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.12.0.0\"
     Version=\"1.13.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.12.0.0\" />
     Version=\"1.13.0.0\" />
   <Properties>
     <DisplayName>QtAV Video Player</DisplayName>
     <PublisherDisplayName>Lucas Wang</PublisherDisplayName>

diff --git a/examples/player/ios/Info.plist b/examples/player/ios/Info.plist
@@ -19,9  19,9 @@
 	<key>CFBundleName</key>
         <string>QtAV Player</string>
 	<key>CFBundleShortVersionString</key>
-        <string>1.12</string>
         <string>1.13</string>
 	<key>CFBundleVersion</key>
-        <string>1.12.0</string>
         <string>1.13.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>

diff --git a/examples/player/player_sdk.pro b/examples/player/player_sdk.pro
@@ -31,7  31,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-2017 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 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
@@ -70,9  70,9 @@ QMAKE_EXTRA_COMPILERS  = extra_copy #
 EXTRA_COPY_FILES = $$qtav_qml.files
 
 QMAKE_WRITE_DEFAULT_RC = 1
-QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
 QMAKE_TARGET_COMPANY = "[email protected]"
 QMAKE_TARGET_DESCRIPTION = "QtAV QML module. QtAV Multimedia framework. http://qtav.org"
-QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
 QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, [email protected]"
 QMAKE_TARGET_PRODUCT = "QtAV QML"
 
 SOURCES  = \

diff --git a/qtc_packaging/ifw/config/config.xml b/qtc_packaging/ifw/config/config.xml
@@ -1,7  1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <Installer>
      <Name>QtAV</Name>
-     <Version>1.12.0</Version>
      <Version>1.13.0</Version>
      <Title>QtAV Multimedia framework</Title>
      <Publisher>WangBin [email protected]</Publisher>
      <ProductUrl>http://qtav.org</ProductUrl>

diff --git a/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.dev/meta/package.xml
@@ -2,8  2,8 @@
  <Package>
      <DisplayName>Development files</DisplayName>
      <Description>Install QtAV headers and lib.</Description>
-     <Version>1.12.0-0</Version>
-     <ReleaseDate>2017-06-20</ReleaseDate>
      <Version>1.13.0-0</Version>
      <ReleaseDate>2019-07-11</ReleaseDate>
      <Name>com.qtav.product.dev</Name>
      <Default>script</Default>
      <Script>installscript.qs</Script>

diff --git a/qtc_packaging/ifw/packages/com.qtav.product.examples/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.examples/meta/package.xml
@@ -2,8  2,8 @@
  <Package>
      <DisplayName>Examples</DisplayName>
      <Description>Install QtAV examples.</Description>
-     <Version>1.12.0-0</Version>
-     <ReleaseDate>2017-06-20</ReleaseDate>
      <Version>1.13.0-0</Version>
      <ReleaseDate>2019-07-11</ReleaseDate>
      <Name>com.qtav.product.examples</Name>
      <Default>script</Default>
      <Script>installscript.qs</Script>

diff --git a/qtc_packaging/ifw/packages/com.qtav.product.player/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.player/meta/package.xml
@@ -2,8  2,8 @@
  <Package>
      <DisplayName>Player</DisplayName>
      <Description>Default player.</Description>
-     <Version>1.12.0-0</Version>
-     <ReleaseDate>2017-06-20</ReleaseDate>
      <Version>1.13.0-0</Version>
      <ReleaseDate>2019-07-11</ReleaseDate>
      <Name>com.qtav.product.player</Name>
      <Default>true</Default>
      <ForcedInstallation>true</ForcedInstallation>

diff --git a/qtc_packaging/ifw/packages/com.qtav.product.runtime/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product.runtime/meta/package.xml
@@ -2,8  2,8 @@
  <Package>
      <DisplayName>Runtime library</DisplayName>
      <Description>Install QtAV runtime library.</Description>
-     <Version>1.12.0-0</Version>
-     <ReleaseDate>2017-06-20</ReleaseDate>
      <Version>1.13.0-0</Version>
      <ReleaseDate>2019-07-11</ReleaseDate>
      <Name>com.qtav.product.runtime</Name>
      <Translations>
          <Translation>zh_CN.qm</Translation>

diff --git a/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml
@@ -2,8  2,8 @@
  <Package>
      <DisplayName>QtAV</DisplayName>
      <Description>Install QtAV multimedia library</Description>
-     <Version>1.12.0-0</Version>
-     <ReleaseDate>2017-06-20</ReleaseDate>
      <Version>1.13.0-0</Version>
      <ReleaseDate>2019-07-11</ReleaseDate>
      <Name>com.qtav.product</Name>
      <Licenses>
          <License name="LGPL v2.1" file="lgpl-2.1.txt" />

diff --git a/src/QtAV.rc b/src/QtAV.rc
@@ -19,10  19,10 @@ BEGIN
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName", "Shanghai University->S3 Graphics->Deepin | [email protected]"
             VALUE "CompanyName", "[email protected]"
             VALUE "FileDescription", "QtAV Multimedia framework. http://qtav.org"
             VALUE "FileVersion", QTAV_VERSION_STR ".0"
-            VALUE "LegalCopyright", "Copyright (C) 2012-2017 WangBin, [email protected]"
             VALUE "LegalCopyright", "Copyright (C) 2012-2019 WangBin, [email protected]"
             VALUE "InternalName", "QtAV"
             VALUE "OriginalFilename", "QtAV.dll"
             VALUE "ProductName", "QtAV"

diff --git a/src/QtAV/version.h b/src/QtAV/version.h
@@ -23,7  23,7 @@
 #define QTAV_VERSION_H
 
 #define QTAV_MAJOR 1    //((QTAV_VERSION&0xff0000)>>16)
-#define QTAV_MINOR 12    //((QTAV_VERSION&0xff00)>>8)
 #define QTAV_MINOR 13    //((QTAV_VERSION&0xff00)>>8)
 #define QTAV_PATCH 0    //(QTAV_VERSION&0xff)
 
 

diff --git a/src/QtAV_Global.cpp b/src/QtAV_Global.cpp
@@ -1,6  1,6 @@
 /******************************************************************************
     QtAV:  Multimedia framework based on Qt and FFmpeg
-    Copyright (C) 2012-2018 Wang Bin <[email protected]>
     Copyright (C) 2012-2019 Wang Bin <[email protected]>
 
 *   This file is part of QtAV
 
@@ -190,13  190,13 @@ QString aboutQtAV_HTML()
 {
     static QString about = QString::fromLatin1("<img src='qrc:/QtAV.svg'><h3>QtAV " QTAV_VERSION_STR_LONG "</h3>\n"
             "<p>%1</p><p>%2</p><p>%3 </p>"
-            "<p>Copyright (C) 2012-2018 Wang Bin (aka. Lucas Wang) <a href='mailto:[email protected]'>[email protected]</a></p>\n"
             "<p>Copyright (C) 2012-2019 Wang Bin (aka. Lucas Wang) <a href='mailto:[email protected]'>[email protected]</a></p>\n"
             "<p>%4: <a href='http://qtav.org/donate.html'>http://qtav.org/donate.html</a></p>\n"
             "<p>%5: <a href='https://github.com/wang-bin/QtAV'>https://github.com/wang-bin/QtAV</a></p>\n"
             "<p>%6: <a href='http://qtav.org'>http://qtav.org</a></p>"
            ).arg(QObject::tr("Multimedia framework base on Qt and FFmpeg.\n"))
             .arg(QObject::tr("Distributed under the terms of LGPLv2.1 or later.\n"))
-            .arg(QObject::tr("Shanghai University->S3 Graphics->Deepin->PPTV, Shanghai, China"))
             .arg(QObject::tr("Shanghai, China"))
             .arg(QObject::tr("Donate"))
             .arg(QObject::tr("Source"))
             .arg(QObject::tr("Home page"));

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -51,9  51,9 @@ RESOURCES  = QtAV.qrc \
 
 !rc_file {
     RC_ICONS = QtAV.ico
-    QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
     QMAKE_TARGET_COMPANY = "[email protected]"
     QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org"
-    QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, [email protected]"
     QMAKE_TARGET_PRODUCT = "QtAV"
 } else:win32 {
     RC_FILE = QtAV.rc

diff --git a/widgets/libQtAVWidgets.pro b/widgets/libQtAVWidgets.pro
@@ -24,9  24,9 @@ preparePaths($$OUT_PWD/../out)
 
 !rc_file {
     RC_ICONS = $$PROJECTROOT/src/QtAV.ico
-    QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
     QMAKE_TARGET_COMPANY = "[email protected]"
     QMAKE_TARGET_DESCRIPTION = "QtAVWidgets module. QtAV Multimedia framework. http://qtav.org"
-    QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
     QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, [email protected]"
     QMAKE_TARGET_PRODUCT = "QtAV Widgets"
 } else:win32 {
     RC_FILE = QtAVWidgets.rc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,6 155,4 @@ Use QtAV in QML with OpenGL shaders(example is from qtmultimedia. But qtmultimed

		> Copyright © Wang Bin [email protected]

		> Shanghai University->S3 Graphics->Deepin, Shanghai, China

		> 2013-01-21