version 1.3.2

- OpenGL improvement and better performance(works on iOS and Android): * enable GLSL if supported * use GLSL to render YUV frames * GLSL based video equalizer - XV bug fix and improvement. Supports NV12. Supports video equalizer. - Play from QIODevice support - Capture YUV frames support. - Fix wrong duration in OSD - CUDA decoder working in progress - player: * no gui blocking while opening a stream * add config dialog - Regressions: * OpenGL can not display H10p
lipy77 · Mar 16, 2014 · 7a13caa · 7a13caa
1 parent 892b3fb
commit 7a13caa
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 38 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3  1,22 @@
 version 1.3.2    2014-03-16
 
 - OpenGL improvement and better performance(works on iOS and Android):
   * enable GLSL if supported
   * use GLSL to render YUV frames
   * GLSL based video equalizer
 - XV bug fix and improvement. Supports NV12. Supports video equalizer.
 - Play from QIODevice support
 - Capture YUV frames support.
 - Fix wrong duration in OSD
 - CUDA decoder working in progress
 - player:
   * no gui blocking while opening a stream
   * add config dialog
 - Regressions:
   * OpenGL can not display H10p
 
 
 
 version 1.3.1    2014-01-27
 
 - Initial OpenAL support.

diff --git a/QtAV.pro b/QtAV.pro
@@ -39,9  39,8 @@ OptionalDepends = \
 !no-portaudio: OptionalDepends *= portaudio
 !no-direct2d: OptionalDepends *= direct2d
 !no-gdiplus: OptionalDepends *= gdiplus
-win32 {
-    !no-dxva: OptionalDepends *= dxva
-}
 # why win32 is false?
 !no-dxva: OptionalDepends *= dxva
 unix {
     !no-xv: OptionalDepends *= xv
     !no-vaapi: OptionalDepends *= vaapi
@@ -54,8  53,8 @@ runConfigTests()
 }
 
 
-PACKAGE_VERSION = 1.3.1
 PACKAGE_VERSION = 1.3.2
 PACKAGE_NAME= QtAV
 
 include(pack.pri)
-#packageSet(1.3.1, QtAV)
 #packageSet(1.3.2, QtAV)
diff --git a/README.md b/README.md
@@ -5,9  5,10 @@ with less effort than ever before.
 
 QtAV has been added to FFmpeg projects page [http://ffmpeg.org/projects.html](http://ffmpeg.org/projects.html)
 
-**QtAV is free software licensed under the term of LGPL v2.1. If you use QtAV or its constituent libraries,
 **QtAV is free software licensed under the term of LGPL v2.1. The player example is licensed under GPL v3.  If you use QtAV or its constituent libraries,
 you must adhere to the terms of the license in question.**
 
 
 #### [Download binaries from sourceforge](https://sourceforge.net/projects/qtav)
 #### [Source code on github](https://github.com/wang-bin/QtAV)
 
@@ -17,7  18,7 @@ QtAV can meet your most demands
 
 - Hardware decoding suppprt: DXVA2, VAAPI(buggy now), CedarX(e.g. pcDuino)
 - Seek, pause/resume
-- Video capture
 - Video capture in rgb and yuv format
 - OSD and custom filters
 - Aspect ratio
 - Transform video using GraphicsItemRenderer. (rotate, shear, etc)
@@ -28,12  29,11 @@ QtAV can meet your most demands
 - Choose audio channel
 - Choose media stream, e.g. play a desired audio track
 - Volume control
-- Fullscreen, stay on top
 - Multiple render engine support. Currently supports QPainter, GDI , Direct2D, XV and OpenGL(and ES2).
 - Dynamically change render engine when playing.
 - Multiple video outputs for 1 player
 - Region of interest(ROI), i.e. video cropping
-- Video eq: brightness, contrast, saturation
 - Video eq: brightness, contrast, saturation, hue
 - QML support as a plugin. Most playback APIs are compatible with QtMultiMedia module
 - Compatiblity: QtAV can be built with both Qt4 and Qt5. QtAV supports
   both FFmpeg(>=0.9) and [Libav](http://libav.org).
@@ -42,7  42,7 @@ QtAV can meet your most demands
 ### Extensible Framework (work in progress)
 
   QtAV currently uses FFmpeg to decode video, convert image and audio data, and uses PortAudio to play
-  sound. Every part in QtAV is designed to be extensible. For example, you can write your decoder, audio output for particular platform. [Here is a very good example to add cedar hardware accelerated decoder for A13-OLinuXino	](https://github.com/mireq/QtAV/commit/d7b428c1dae66b2a85b7a6bfa7b253980b5b963c)
   sound. Every part in QtAV is designed to be extensible. For example, you can write your decoder, audio output for particular platform. [Here is a very good example to add cedar hardware accelerated decoder for A13-OLinuXino](https://github.com/mireq/QtAV/commit/d7b428c1dae66b2a85b7a6bfa7b253980b5b963c)
 
 
 # For Developers
@@ -53,7  53,7 @@ QtAV can meet your most demands
 
 [![FFmpeg](http://ffmpeg.org/ffmpeg-logo.png)](http://ffmpeg.org)
 
-or [Libav](libav.org) (>=0.8) Latest version is recommanded.
 or [Libav](libav.org) (>=0.9) Latest version is recommanded.
 
 [![Libav](http://libav.org/libav-logo-text.png)](http://libav.org)
 
@@ -141,7  141,7 @@ For End Users
 
 An simple player can be found in examples. The command line options is
 
-    player [-ao null] [-vo qt|gl|d2d|gdi|xv] [-vd "dxva[;vaapi[;ffmpeg]]"] [url|path|pipe:]
     player [-ao null] [-vo qt|gl|d2d|gdi|xv] [-vd "dxva[;vaapi[;ffmpeg]]"] [--ffmpeg-log] [url|path|pipe:]
 
 To disable audio output, add `-ao null`
 
@@ -179,9  179,7 @@ QMLPlayer has less options now. To use DXVA decoder:
 - Ctrl Up/Down: speed   / -
 - -> / <-: seek forward / backward
 - Drag and drop a media file to player
-- Wheel: zoom in/out
-
-Before QtAV 1.3.1, the default behavior can be replaced by subclassing QObject and call `void AVPlayer::setPlayerEventFilter(QObject *obj)` (use null to disable).
 - Crtl Wheel: zoom in/out
 
 
 # TODO
@@ -223,11  221,11 @@ Video Wall
 
 Thanks
 
-Now I have received 1050 RMB(about 160$)
 Now I have received 1050 RMB(about 160$) and 100$
 
 [![Alipay](https://img.alipay.com/sys/personalprod/style/mc/top-logo.png)](https://me.alipay.com/lucaswang)
 
-[PayPal ![Paypal](http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif)](https://sourceforge.net/p/qtav/wiki/Donate 捐赠)
 [PayPal ![Paypal](http://www.paypal.com/en_US/i/btn/btn_donate_LG.gif)](http://wang-bin.github.io/qtav.org#donate)
 
 [![Support via Gittip](https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png)](https://www.gittip.com/wang-bin)
 

diff --git a/examples/QMLPlayer/qml/QMLPlayer/main.qml b/examples/QMLPlayer/qml/QMLPlayer/main.qml
@@ -187,7  187,7 @@ Rectangle {
             onLinkActivated: Qt.openUrlExternally(link)
         }
         function helpText() {
-            return "<h3>QMLPlayer based on QtAV  1.3.1 </h3>"
             return "<h3>QMLPlayer based on QtAV  1.3.2 </h3>"
                "<p>Distributed under the terms of LGPLv2.1 or later.</p>"
                "<p>Copyright (C) 2012-2014 Wang Bin (aka. Lucas Wang) <a href='mailto:[email protected]'>[email protected]</a></p>"
                "<p>Shanghai University->S3 Graphics, Shanghai, China</p>"
@@ -218,7  218,7 @@ Rectangle {
             anchors.margins: 8
             width: 80
             height: 40
-            onClicked: Qt.openUrlExternally("https://sourceforge.net/p/qtav/wiki/Donate 捐赠")
             onClicked: Qt.openUrlExternally("http://wang-bin.github.io/QtAV#donate")
         }
     }
 

diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri
@@ -48,7  48,7 @@ NAME = common
 }
 eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1)
 
-LIB_VERSION = 1.3.1 #0.x.y may be wrong for dll
 LIB_VERSION = 1.3.2 #0.x.y may be wrong for dll
 isEmpty(STATICLINK): STATICLINK = 0  #1 or 0. use static lib or not
 
 TEMPLATE  = fakelib

diff --git a/qml/libQmlAV.pri b/qml/libQmlAV.pri
@@ -48,7  48,7 @@ NAME = QmlAV
 }
 eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1)
 
-LIB_VERSION = 1.3.1 #0.x.y may be wrong for dll
 LIB_VERSION = 1.3.2 #0.x.y may be wrong for dll
 isEmpty(STATICLINK): STATICLINK = 0  #1 or 0. use static lib or not
 
 TEMPLATE  = fakelib

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.3.1</Version>
      <Version>1.3.2</Version>
      <Title>QtAV Installer</Title>
      <Publisher>[email protected]</Publisher>
      <ProductUrl>https://github.com/wang-bin/QtAV</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,9  2,9 @@
  <Package>
      <DisplayName>Development files</DisplayName>
      <Description>Install QtAV headers and lib.</Description>
-     <Version>1.3.1-0</Version>
-     <ReleaseDate>2014-01-27</ReleaseDate>
      <Version>1.3.2-0</Version>
      <ReleaseDate>2014-03-16</ReleaseDate>
      <Name>com.qtav.product.dev</Name>
      <Default>script</Default>
      <Script>installscript.qs</Script>
- </Package>
  </Package>
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,9  2,9 @@
  <Package>
      <DisplayName>Examples</DisplayName>
      <Description>Install QtAV examples.</Description>
-     <Version>1.3.1-0</Version>
-     <ReleaseDate>2014-01-27</ReleaseDate>
      <Version>1.3.2-0</Version>
      <ReleaseDate>2014-03-16</ReleaseDate>
      <Name>com.qtav.product.examples</Name>
      <Default>script</Default>
      <Script>installscript.qs</Script>
- </Package>
  </Package>
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,11  2,11 @@
  <Package>
      <DisplayName>Player</DisplayName>
      <Description>Default player.</Description>
-     <Version>1.3.1-0</Version>
-     <ReleaseDate>2014-01-27</ReleaseDate>
      <Version>1.3.2-0</Version>
      <ReleaseDate>2014-03-16</ReleaseDate>
      <Name>com.qtav.product.player</Name>
      <Default>true</Default>
      <ForcedInstallation>true</ForcedInstallation>
      <SortingPriority>7</SortingPriority>
      <Script>installscript.qs</Script>
-</Package>
 </Package>
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.3.1-0</Version>
-     <ReleaseDate>2014-01-27</ReleaseDate>
      <Version>1.3.2-0</Version>
      <ReleaseDate>2014-03-16</ReleaseDate>
      <Name>com.qtav.product.runtime</Name>
      <Translations>
          <Translation>zh_CN.qm</Translation>
@@ -12,4  12,4 @@
      <Essential>true</Essential>
      <ForcedInstallation>true</ForcedInstallation>
      <SortingPriority>8</SortingPriority>
-</Package>
 </Package>
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.3.1-0</Version>
-     <ReleaseDate>2014-01-27</ReleaseDate>
      <Version>1.3.2-0</Version>
      <ReleaseDate>2014-03-16</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
@@ -24,7  24,7 @@
 
 #define QTAV_MAJOR 1    //((QTAV_VERSION&0xff0000)>>16)
 #define QTAV_MINOR 3    //((QTAV_VERSION&0xff00)>>8)
-#define QTAV_PATCH 1    //(QTAV_VERSION&0xff)
 #define QTAV_PATCH 2    //(QTAV_VERSION&0xff)
 
 
 #define QTAV_VERSION_MAJOR(V) ((V & 0xff0000) >> 16)

diff --git a/src/QtAV_Global.cpp b/src/QtAV_Global.cpp
@@ -149,6  149,7 @@ QString aboutQtAV_HTML()
             "<p>"   QObject::tr("Distributed under the terms of LGPLv2.1 or later.\n")   "</p>"
             "<p>Copyright (C) 2012-2014 Wang Bin (aka. Lucas Wang) <a href='mailto:[email protected]'>[email protected]</a></p>\n"
             "<p>"   QObject::tr("Shanghai University->S3 Graphics, Shanghai, China\n")   "</p>"
             "<p>"   QObject::tr("Donate")   ": <a href='http://wang-bin.github.io/QtAV#donate'>http://wang-bin.github.io/QtAV#donate</a></p>\n"
             "<p>"   QObject::tr("Source")   ": <a href='https://github.com/wang-bin/QtAV'>https://github.com/wang-bin/QtAV</a></p>\n"
             "<p>"   QObject::tr("Downloads")   ": <a href='https://sourceforge.net/projects/qtav'>https://sourceforge.net/projects/qtav</a></p>";
     return about;

diff --git a/src/libQtAV.pri b/src/libQtAV.pri
@@ -48,7  48,7 @@ NAME = QtAV
 }
 eval(LIB$$upper($$NAME)_PRI_INCLUDED = 1)
 
-LIB_VERSION = 1.3.1 #0.x.y may be wrong for dll
 LIB_VERSION = 1.3.2 #0.x.y may be wrong for dll
 isEmpty(STATICLINK): STATICLINK = 0  #1 or 0. use static lib or not
 
 TEMPLATE  = fakelib