diff --git a/.qmake.conf b/.qmake.conf index d3b8d95c6..ef57faf62 100644 --- 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 index df7654672..88746affe 100644 --- 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 index 99ce223c9..edbc12268 100644 --- 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 index 9895d05e4..874778603 100644 --- a/README.md +++ b/README.md @@ -155,6 +155,4 @@ Use QtAV in QML with OpenGL shaders(example is from qtmultimedia. But qtmultimed > Copyright © Wang Bin wbsecg1@gmail.com -> Shanghai University->S3 Graphics->Deepin, Shanghai, China - > 2013-01-21 diff --git a/cmake/QtAV.rc.in b/cmake/QtAV.rc.in index ba008ec96..7cdd69e87 100644 --- 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 | wbsecg1@gmail.com" + VALUE "CompanyName", "wbsecg1@gmail.com" VALUE "FileDescription", "QtAV Multimedia framework. http://qtav.org" VALUE "FileVersion", QTAV_VERSION_STR ".0" - VALUE "LegalCopyright", "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" + VALUE "LegalCopyright", "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" VALUE "InternalName", "@MODULE@" VALUE "ProductName", "@MODULE@" VALUE "ProductVersion", QTAV_VERSION_STR ".0" diff --git a/debian/changelog b/debian/changelog index 603686c0e..157919b2e 100644 --- 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) 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 index cf528c476..53a7a07f5 100644 --- 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 | wbsecg1@gmail.com" QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia playback framework. http://qtav.org" - QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" + QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" 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 index 0b1df889e..8875049f1 100644 --- a/examples/QMLPlayer/android/AndroidManifest.xml +++ b/examples/QMLPlayer/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/QMLPlayer/ios/Info.plist b/examples/QMLPlayer/ios/Info.plist index 098df396d..b8621c064 100644 --- a/examples/QMLPlayer/ios/Info.plist +++ b/examples/QMLPlayer/ios/Info.plist @@ -19,9 +19,9 @@ CFBundleName ${PRODUCT_NAME} CFBundleShortVersionString - 1.12 + 1.13 CFBundleVersion - 1.12.0 + 1.13.0 LSRequiresIPhoneOS UIFileSharingEnabled diff --git a/examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest b/examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest index f3877185e..42b9092a0 100644 --- 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\" /> diff --git a/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest b/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest index b72e3f0d1..4a267495c 100644 --- a/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest +++ b/examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest @@ -10,7 +10,7 @@ + Version=\"1.13.0.0\" /> QtAV Video Player Lucas Wang diff --git a/examples/player/ios/Info.plist b/examples/player/ios/Info.plist index dbd3b7dda..c60e4758c 100644 --- a/examples/player/ios/Info.plist +++ b/examples/player/ios/Info.plist @@ -19,9 +19,9 @@ CFBundleName QtAV Player CFBundleShortVersionString - 1.12 + 1.13 CFBundleVersion - 1.12.0 + 1.13.0 LSRequiresIPhoneOS UIFileSharingEnabled diff --git a/examples/player/player_sdk.pro b/examples/player/player_sdk.pro index c42ba8cb9..31ab5c126 100644 --- 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 | wbsecg1@gmail.com" QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org" - QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" + QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" QMAKE_TARGET_PRODUCT = "QtAV $$1" export(RC_ICONS) export(QMAKE_TARGET_COMPANY) diff --git a/qml/libQmlAV.pro b/qml/libQmlAV.pro index 6026d7588..e07c3e8c9 100644 --- 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 | wbsecg1@gmail.com" +QMAKE_TARGET_COMPANY = "wbsecg1@gmail.com" QMAKE_TARGET_DESCRIPTION = "QtAV QML module. QtAV Multimedia framework. http://qtav.org" -QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" +QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" QMAKE_TARGET_PRODUCT = "QtAV QML" SOURCES += \ diff --git a/qtc_packaging/ifw/config/config.xml b/qtc_packaging/ifw/config/config.xml index df5742190..2c743e89a 100644 --- a/qtc_packaging/ifw/config/config.xml +++ b/qtc_packaging/ifw/config/config.xml @@ -1,7 +1,7 @@ QtAV - 1.12.0 + 1.13.0 QtAV Multimedia framework WangBin wbsecg1@gmail.com http://qtav.org 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 index 408b78397..ded6ffba1 100644 --- 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 @@ Development files Install QtAV headers and lib. - 1.12.0-0 - 2017-06-20 + 1.13.0-0 + 2019-07-11 com.qtav.product.dev 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 index c3269b18f..673e611ac 100644 --- 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 @@ Examples Install QtAV examples. - 1.12.0-0 - 2017-06-20 + 1.13.0-0 + 2019-07-11 com.qtav.product.examples 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 index 1d861cb8d..b0df43794 100644 --- 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 @@ Player Default player. - 1.12.0-0 - 2017-06-20 + 1.13.0-0 + 2019-07-11 com.qtav.product.player true true 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 index 83e5cd69a..04a5747f0 100644 --- 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 @@ Runtime library Install QtAV runtime library. - 1.12.0-0 - 2017-06-20 + 1.13.0-0 + 2019-07-11 com.qtav.product.runtime zh_CN.qm diff --git a/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml b/qtc_packaging/ifw/packages/com.qtav.product/meta/package.xml index 139380156..c68e231f5 100644 --- 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 @@ QtAV Install QtAV multimedia library - 1.12.0-0 - 2017-06-20 + 1.13.0-0 + 2019-07-11 com.qtav.product diff --git a/src/QtAV.rc b/src/QtAV.rc index 19f78e749..01a75fe46 100644 --- a/src/QtAV.rc +++ b/src/QtAV.rc @@ -19,10 +19,10 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "CompanyName", "Shanghai University->S3 Graphics->Deepin | wbsecg1@gmail.com" + VALUE "CompanyName", "wbsecg1@gmail.com" VALUE "FileDescription", "QtAV Multimedia framework. http://qtav.org" VALUE "FileVersion", QTAV_VERSION_STR ".0" - VALUE "LegalCopyright", "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" + VALUE "LegalCopyright", "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" VALUE "InternalName", "QtAV" VALUE "OriginalFilename", "QtAV.dll" VALUE "ProductName", "QtAV" diff --git a/src/QtAV/version.h b/src/QtAV/version.h index 88c05969e..c969cefad 100644 --- 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 index 553e8ca3c..4268c45d5 100644 --- 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 + Copyright (C) 2012-2019 Wang Bin * This file is part of QtAV @@ -190,13 +190,13 @@ QString aboutQtAV_HTML() { static QString about = QString::fromLatin1("

QtAV " QTAV_VERSION_STR_LONG "

\n" "

%1

%2

%3

" - "

Copyright (C) 2012-2018 Wang Bin (aka. Lucas Wang) wbsecg1@gmail.com

\n" + "

Copyright (C) 2012-2019 Wang Bin (aka. Lucas Wang) wbsecg1@gmail.com

\n" "

%4: http://qtav.org/donate.html

\n" "

%5: https://github.com/wang-bin/QtAV

\n" "

%6: http://qtav.org

" ).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 index 96272a3f9..8e49668c4 100644 --- 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 | wbsecg1@gmail.com" + QMAKE_TARGET_COMPANY = "wbsecg1@gmail.com" QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org" - QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" + QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" QMAKE_TARGET_PRODUCT = "QtAV" } else:win32 { RC_FILE = QtAV.rc diff --git a/widgets/libQtAVWidgets.pro b/widgets/libQtAVWidgets.pro index 7c60148e9..599aa90ac 100644 --- 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 | wbsecg1@gmail.com" + QMAKE_TARGET_COMPANY = "wbsecg1@gmail.com" QMAKE_TARGET_DESCRIPTION = "QtAVWidgets module. QtAV Multimedia framework. http://qtav.org" - QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, wbsecg1@gmail.com" + QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2019 WangBin, wbsecg1@gmail.com" QMAKE_TARGET_PRODUCT = "QtAV Widgets" } else:win32 { RC_FILE = QtAVWidgets.rc