version 1.8.0

Changelog: - XAudio2 support - VideoToolbox hardware decoder(OSX) support. It can decode h264, h263, mpeg1, mpeg2, mpeg4. Better than VDA - CUDA 0-copy support - Dynamic video decoder switch when playing (try it in QMLPlayer) - Embedded ass subtitles support - ass subtitle font setup - No OpenGL build fix for linux - Fix qpainter rendering if vbo is used - Fix OpenGL rendering for some rgb formats - DXVA 0-copy improvement, intel clearvideo workaround etc. - AO: add null backend - HW: fix profile check - Ref counted frames from ff decoders. This fix opengl crash when uploading textures - Fix audio resampler parameters not set correctly - VS2015 support
wuliao3ge · Sep 1, 2015 · 8f8ae59 · 8f8ae59
1 parent d9c90dc
commit 8f8ae59
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 106 deletions.
diff --git a/.qmake.conf b/.qmake.conf
@@ -1,5  1,5 @@
 QTAV_MAJOR_VERSION = 1
-QTAV_MINOR_VERSION = 7
 QTAV_MINOR_VERSION = 8
 QTAV_PATCH_VERSION = 0
 
 QTAV_VERSION = $${QTAV_MAJOR_VERSION}.$${QTAV_MINOR_VERSION}.$${QTAV_PATCH_VERSION}

diff --git a/Changelog b/Changelog
@@ -1,3  1,23 @@
 version 1.8.0 2015-09-01
 
 Changelog:
 - XAudio2 support
 - VideoToolbox hardware decoder(OSX) support. It can decode h264, h263, mpeg1, mpeg2, mpeg4. Better than VDA
 - CUDA 0-copy support
 - Dynamic video decoder switch when playing (try it in QMLPlayer)
 - Embedded ass subtitles support
 - ass subtitle font setup
 - No OpenGL build fix for linux
 - Fix qpainter rendering if vbo is used
 - Fix OpenGL rendering for some rgb formats
 - DXVA 0-copy improvement, intel clearvideo workaround etc.
 - AO: add null backend
 - HW: fix profile check
 - Ref counted frames from ff decoders. This fix opengl crash when uploading textures
 - Fix audio resampler parameters not set correctly
 - VS2015 support
 
 
 version 1.7.0 2015-07-09
 
 Changelog:

diff --git a/debian/changelog b/debian/changelog
@@ -1,3  1,23 @@
 qtav (1.8.0) unstable; urgency=low
 
   * XAudio2 support
   * VideoToolbox hardware decoder(OSX) support
   * CUDA 0-copy support
   * Dynamic video decoder switch when playing (try it in QMLPlayer)
   * Embedded ass subtitles support
   * ass subtitle font setup
   * No OpenGL build fix for linux
   * Fix qpainter rendering if vbo is used
   * Fix OpenGL rendering for some rgb formats
   * DXVA 0-copy improvement, intel clearvideo workaround etc.
   * AO: add null backend
   * HW: fix profile check
   * Ref counted frames from ff decoders. Fix crash uploading textures
   * Fix audio resampler parameters not set correctly
   * VS2015 support
 
  -- Wang Bin (Lucas) <[email protected]>  Tue, 01 Sep 2015 13:25:13  0800
 
 qtav (1.7.0) unstable; urgency=low
 
   * DXVA GPU zero-copy support

diff --git a/debian/ubuntu.sh b/debian/ubuntu.sh
@@ -16,7  16,7 @@ DATE=`date -d @$(git log -n1 --format="%at")  %Y%m%d`
 for D in ${DISTRIBUTIONS[@]}; do
   git checkout -- debian/changelog
   cp -avf debian/changelog $CHANGELOG_BAK
-  VER=1.7.0~`git log -1 --pretty=format:"git${DATE}.%h~${D}" 2> /dev/null`
   VER=1.8.0~`git log -1 --pretty=format:"git${DATE}.%h~${D}" 2> /dev/null`
   mkchangelog $VER $D
   debuild -S -sa
   dput -f ppa:wbsecg1/qtav ../qtav_${VER}_source.changes

diff --git a/doc/TODO.md b/doc/TODO.md
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.7.0" android:versionCode="1" android:installLocation="auto">
 <manifest package="org.qtav.qmlplayer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.0" android:versionCode="2" 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/qml/QMLPlayer/About.qml b/examples/QMLPlayer/qml/QMLPlayer/About.qml
@@ -18,7  18,7 @@ Page {
             font.pixelSize: Utils.scaled(14)
             onContentHeightChanged: parent.height = contentHeight   2*anchors.margins
             onLinkActivated: Qt.openUrlExternally(link)
-            text: "<h3>QMLPlayer "   qsTr("based on")   " QtAV 1.7.0 </h3>"
             text: "<h3>QMLPlayer "   qsTr("based on")   " QtAV 1.8.0 </h3>"
                     "<p>"   qsTr("QtAV is a corss-platform, high performace multimedia playback framework")   "</p>"
                     "<p>Distributed under the terms of LGPLv2.1 or later.</p>"
                     "<p>Copyright (C) 2012-2015 Wang Bin (aka. Lucas Wang) <a href='mailto:[email protected]'>[email protected]</a></p>"

diff --git a/examples/QMLPlayer/qml/QMLPlayer/SubtitlePage.qml b/examples/QMLPlayer/qml/QMLPlayer/SubtitlePage.qml
@@ -203,10  203,7 @@ Page {
                             width: Utils.scaled(50)
                             anchors.right: parent.right
                             height: parent.height
-                            onClicked: {
-                                PlayerConfig.assFontFile = ""
-                                openFontFile.text = ""
-                            }
                             onClicked: PlayerConfig.assFontFile = ""
                         }
                     }
                     Item {
@@ -236,10  233,7 @@ Page {
                             width: Utils.scaled(50)
                             anchors.right: parent.right
                             height: parent.height
-                            onClicked: {
-                                PlayerConfig.assFontsDir = ""
-                                fontsDir.text = "" //why does it not update?
-                            }
                             onClicked: PlayerConfig.assFontsDir = ""
                         }
                     }
                 }
@@ -356,21  350,15 @@ Page {
         id: fontFileDialog
         title: qsTr("Choose a font file")
         folder: PlayerConfig.assFontFile
-        onAccepted: {
-            fontFile.text = fileUrl
-            PlayerConfig.assFontFile = fileUrl
-        }
         onAccepted: PlayerConfig.assFontFile = fileUrl
     }
 
     FileDialog {
         id: fontsDirDialog
         title: qsTr("Choose a fonts dir")
         selectFolder: true
         folder: PlayerConfig.assFontsDir
-        onAccepted: {
-            fontsDir.text = folder
-            PlayerConfig.assFontsDir = folder
-        }
         onAccepted: PlayerConfig.assFontsDir = folder
     }
 
     FileDialog {

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.7.0</Version>
      <Version>1.8.0</Version>
      <Title>QtAV-Multimedia playback framework</Title>
      <Publisher>WangBin [email protected]</Publisher>
      <ProductUrl>http://www.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.7.0-0</Version>
-     <ReleaseDate>2015-07-09</ReleaseDate>
      <Version>1.8.0-0</Version>
      <ReleaseDate>2015-09-01</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.7.0-0</Version>
-     <ReleaseDate>2015-07-09</ReleaseDate>
      <Version>1.8.0-0</Version>
      <ReleaseDate>2015-09-01</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.7.0-0</Version>
-     <ReleaseDate>2015-07-09</ReleaseDate>
      <Version>1.8.0-0</Version>
      <ReleaseDate>2015-09-01</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.7.0-0</Version>
-     <ReleaseDate>2015-07-09</ReleaseDate>
      <Version>1.8.0-0</Version>
      <ReleaseDate>2015-09-01</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.7.0-0</Version>
-     <ReleaseDate>2015-07-09</ReleaseDate>
      <Version>1.8.0-0</Version>
      <ReleaseDate>2015-09-01</ReleaseDate>
      <Name>com.qtav.product</Name>
      <Licenses>
          <License name="LGPL v2.1" file="lgpl-2.1.txt" />

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 7    //((QTAV_VERSION&0xff00)>>8)
 #define QTAV_MINOR 8    //((QTAV_VERSION&0xff00)>>8)
 #define QTAV_PATCH 0    //(QTAV_VERSION&0xff)
 
 

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -258,7  258,7 @@ config_videotoolbox {
   DEFINES *= QTAV_HAVE_VIDEOTOOLBOX=1
   SOURCES  = codec/video/VideoDecoderVideoToolbox.cpp
   LIBS  = -framework CoreVideo -framework CoreFoundation -framework CoreMedia \
-          -framework IOSurface
           -framework IOSurface -framework VideoToolbox
 }
 
 config_gl|config_opengl {