Skip to content

Commit f672e4a

Browse files
wang-binwang-bin
committed
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
1 parent cd2e79e commit f672e4a

File tree

27 files changed

+298
-36
lines changed

27 files changed

+298
-36
lines changed

‎.qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
QTAV_MAJOR_VERSION = 1
2-
QTAV_MINOR_VERSION = 11
2+
QTAV_MINOR_VERSION = 12
33
QTAV_PATCH_VERSION = 0
44

55
QTAV_VERSION = $${QTAV_MAJOR_VERSION}.$${QTAV_MINOR_VERSION}.$${QTAV_PATCH_VERSION}

‎Changelog

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
version 1.12.0 2017-06-20
2+
3+
Changelog
4+
- CMake support
5+
- Fix iOS build
6+
- Fix AVPacket memory leak
7+
- Geometry & GeometryRenderer class is public
8+
- PAL8, XYZ color format support
9+
- Fix OpenGL background color
10+
- Fix external clock error after pause
11+
- VA-API encoder support (ffmpeg>=3)
12+
- Other improvements, fixes, and untested features
13+
114
version 1.11.0 2016-06-19
215

316
Changelog

‎common.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ isEmpty(QMAKE_EXTENSION_SHLIB) {
3232

3333
CONFIG += profile
3434
#profiling, -pg is not supported for msvc
35-
debug:!android:!*msvc*:profile {
35+
debug:!ios:!android:!*msvc*:profile {
3636
QMAKE_CXXFLAGS_DEBUG += -pg
3737
QMAKE_LFLAGS_DEBUG += -pg
3838
QMAKE_CXXFLAGS_DEBUG = $$unique(QMAKE_CXXFLAGS_DEBUG)

‎debian/changelog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
qtav (1.12.0) unstable; urgency=low
2+
3+
* CMake support
4+
* Fix iOS build
5+
* Fix AVPacket memory leak
6+
* Geometry & GeometryRenderer class is public
7+
* PAL8, XYZ color format support
8+
* Fix OpenGL background color
9+
* Fix external clock error after pause
10+
* VA-API encoder support (ffmpeg>=3)
11+
* Other improvements, fixes, and untested features
12+
13+
-- Wang Bin (Lucas) <[email protected]> Tue, 20 Jun 2017 20:44:14 +0800
14+
115
qtav (1.11.0) unstable; urgency=low
216

317
* Dynamic load QtAVWidgets in VideoOutput. avwidgets module is not requred now.

‎debian/ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ for D in ${DISTRIBUTIONS[@]}; do
1919
git checkout -- debian/changelog debian/control
2020
cp -avf debian/control $CONTROL_BAK
2121
cp -avf debian/changelog $CHANGELOG_BAK
22-
VER=1.11.0~`git log -1 --pretty=format:"git${DATE}.%h~${D}" 2> /dev/null`
22+
VER=1.12.0~`git log -1 --pretty=format:"git${DATE}.%h~${D}" 2> /dev/null`
2323
mkchangelog $VER $D
2424
if [ $idx -gt 3 ]; then
2525
sed -i 's,qtdeclarative5-controls-plugin,qml-module-qtquick-controls,g' debian/control

‎examples/QMLPlayer/QMLPlayer_sdk.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ defineTest(genRC) {
5656
RC_ICONS = $$PROJECTROOT/src/QtAV.ico
5757
QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
5858
QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia playback framework. http://qtav.org"
59-
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
59+
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
6060
QMAKE_TARGET_PRODUCT = "QtAV $$1"
6161
export(RC_ICONS)
6262
export(QMAKE_TARGET_COMPANY)

‎examples/QMLPlayer/android/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<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">
2+
<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">
33
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="QMLPlayer" android:icon="@drawable/icon">
44
<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">
55
<intent-filter>

‎examples/QMLPlayer/ios/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<key>CFBundleName</key>
2020
<string>${PRODUCT_NAME}</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.11</string>
22+
<string>1.12</string>
2323
<key>CFBundleVersion</key>
24-
<string>1.11.0</string>
24+
<string>1.12.0</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>UIFileSharingEnabled</key>

‎examples/QMLPlayer/winrt/WinPhone8.Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Name=\"org.qtav.qmlplayer\"
55
ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\"
66
Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
7-
Version=\"1.11.0.0\" />
7+
Version=\"1.12.0.0\" />
88
<mp:PhoneIdentity
99
PhoneProductId=\"e556656c-d8e8-49f9-8148-26506e94575a\"
1010
PhonePublisherId=\"00000000-0000-0000-0000-000000000000\" />

‎examples/QMLPlayer/winrt/WinRT10.Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Identity
1111
Name=\"org.qtav.qmlplayer\"
1212
Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
13-
Version=\"1.11.0.0\"
13+
Version=\"1.12.0.0\"
1414
ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\" /> <!--replaced by qmake-->
1515
<mp:PhoneIdentity
1616
PhoneProductId=\"e556656c-d8e8-49f9-8148-26506e94575a\"

‎examples/QMLPlayer/winrt/WinRT8.Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Name=\"org.qtav.qmlplayer\"
55
ProcessorArchitecture=\"$$lower($$VCPROJ_ARCH)\"
66
Publisher=\"CN=930FB10A-C50C-4801-84BA-255229D27D44\"
7-
Version=\"1.11.0.0\" />
7+
Version=\"1.12.0.0\" />
88
<Properties>
99
<DisplayName>QtAV Video Player</DisplayName>
1010
<PublisherDisplayName>Lucas Wang</PublisherDisplayName>

‎examples/common/libcommon.pri

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ defineTest(genRC) {
152152
RC_ICONS = $$PROJECTROOT/src/QtAV.ico
153153
QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
154154
QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org"
155-
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
155+
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
156156
QMAKE_TARGET_PRODUCT = "QtAV $$1"
157157
export(RC_ICONS)
158158
export(QMAKE_TARGET_COMPANY)

‎examples/player/ios/Info.plist

Lines changed: 231 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleIconFile</key>
6+
<string>@ICON@</string>
7+
<key>CFBundlePackageType</key>
8+
<string>APPL</string>
9+
<key>CFBundleGetInfoString</key>
10+
<string>Created by Wang Bin</string>
11+
<key>CFBundleSignature</key>
12+
<string>????</string>
13+
<key>CFBundleExecutable</key>
14+
<string>Player</string>
15+
<key>CFBundleIdentifier</key>
16+
<string>org.qtav.player</string>
17+
<key>CFBundleDisplayName</key>
18+
<string>QtAV Player</string>
19+
<key>CFBundleName</key>
20+
<string>QtAV Player</string>
21+
<key>CFBundleShortVersionString</key>
22+
<string>1.12</string>
23+
<key>CFBundleVersion</key>
24+
<string>1.12.0</string>
25+
<key>LSRequiresIPhoneOS</key>
26+
<true/>
27+
<key>UIFileSharingEnabled</key>
28+
<true/>
29+
<key>UILaunchStoryboardName</key>
30+
<string>LaunchScreen</string>
31+
<key>UISupportedInterfaceOrientations</key>
32+
<array>
33+
<string>UIInterfaceOrientationPortrait</string>
34+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
35+
<string>UIInterfaceOrientationLandscapeLeft</string>
36+
<string>UIInterfaceOrientationLandscapeRight</string>
37+
</array>
38+
<key>NOTE</key>
39+
<string>This file was generated by Qt/QMake.</string>
40+
<key>CFBundleDocumentTypes</key>
41+
<array>
42+
<dict>
43+
<key>CFBundleTypeExtensions</key>
44+
<array>
45+
<string>AAC</string>
46+
<string>AC3</string>
47+
<string>AIFF</string>
48+
<string>M4A</string>
49+
<string>MKA</string>
50+
<string>MP3</string>
51+
<string>OGG</string>
52+
<string>PCM</string>
53+
<string>VAW</string>
54+
<string>WAV</string>
55+
<string>WAW</string>
56+
<string>WMA</string>
57+
<string>aac</string>
58+
<string>ac3</string>
59+
<string>aiff</string>
60+
<string>m4a</string>
61+
<string>mka</string>
62+
<string>mp3</string>
63+
<string>ogg</string>
64+
<string>pcm</string>
65+
<string>vaw</string>
66+
<string>wav</string>
67+
<string>waw</string>
68+
<string>wma</string>
69+
</array>
70+
<key>CFBundleTypeIconFile</key>
71+
<string>document.icns</string>
72+
<key>CFBundleTypeName</key>
73+
<string>Audio file</string>
74+
<key>CFBundleTypeRole</key>
75+
<string>Viewer</string>
76+
<key>LSTypeIsPackage</key>
77+
<false/>
78+
<key>NSPersistentStoreTypeKey</key>
79+
<string>XML</string>
80+
</dict>
81+
<dict>
82+
<key>CFBundleTypeExtensions</key>
83+
<array>
84+
<string>*</string>
85+
<string>*</string>
86+
<string>3GP</string>
87+
<string>3IV</string>
88+
<string>3gp</string>
89+
<string>3iv</string>
90+
<string>ASF</string>
91+
<string>AVI</string>
92+
<string>CPK</string>
93+
<string>DAT</string>
94+
<string>DIVX</string>
95+
<string>DV</string>
96+
<string>FLAC</string>
97+
<string>FLI</string>
98+
<string>FLV</string>
99+
<string>H264</string>
100+
<string>I263</string>
101+
<string>M2TS</string>
102+
<string>M4V</string>
103+
<string>MKV</string>
104+
<string>MOV</string>
105+
<string>MP2</string>
106+
<string>MP4</string>
107+
<string>MPEG</string>
108+
<string>MPG</string>
109+
<string>MPG2</string>
110+
<string>MPG4</string>
111+
<string>NSV</string>
112+
<string>NUT</string>
113+
<string>NUV</string>
114+
<string>OGG</string>
115+
<string>OGM</string>
116+
<string>QT</string>
117+
<string>RM</string>
118+
<string>RMVB</string>
119+
<string>VCD</string>
120+
<string>VFW</string>
121+
<string>VOB</string>
122+
<string>WEBM</string>
123+
<string>WMV</string>
124+
<string>asf</string>
125+
<string>avi</string>
126+
<string>cpk</string>
127+
<string>dat</string>
128+
<string>divx</string>
129+
<string>dv</string>
130+
<string>flac</string>
131+
<string>fli</string>
132+
<string>flv</string>
133+
<string>h264</string>
134+
<string>i263</string>
135+
<string>m2ts</string>
136+
<string>m4v</string>
137+
<string>mkv</string>
138+
<string>mov</string>
139+
<string>mp2</string>
140+
<string>mp4</string>
141+
<string>mpeg</string>
142+
<string>mpg</string>
143+
<string>mpg2</string>
144+
<string>mpg4</string>
145+
<string>mts</string>
146+
<string>nsv</string>
147+
<string>nut</string>
148+
<string>nuv</string>
149+
<string>ogg</string>
150+
<string>ogm</string>
151+
<string>qt</string>
152+
<string>rm</string>
153+
<string>rmvb</string>
154+
<string>vcd</string>
155+
<string>vfw</string>
156+
<string>vob</string>
157+
<string>webm</string>
158+
<string>wmv</string>
159+
<string>f4v</string>
160+
<string>ts</string>
161+
</array>
162+
<key>CFBundleTypeIconFile</key>
163+
<string>document.icns</string>
164+
<key>CFBundleTypeName</key>
165+
<string>Movie file</string>
166+
<key>CFBundleTypeRole</key>
167+
<string>Viewer</string>
168+
<key>LSTypeIsPackage</key>
169+
<false/>
170+
<key>NSPersistentStoreTypeKey</key>
171+
<string>XML</string>
172+
</dict>
173+
<dict>
174+
<key>CFBundleTypeExtensions</key>
175+
<array>
176+
<string>AQT</string>
177+
<string>ASS</string>
178+
<string>JSS</string>
179+
<string>RT</string>
180+
<string>SMI</string>
181+
<string>SRT</string>
182+
<string>SSA</string>
183+
<string>SUB</string>
184+
<string>TXT</string>
185+
<string>UTF</string>
186+
<string>aqt</string>
187+
<string>ass</string>
188+
<string>jss</string>
189+
<string>rt</string>
190+
<string>smi</string>
191+
<string>srt</string>
192+
<string>ssa</string>
193+
<string>sub</string>
194+
<string>txt</string>
195+
<string>utf</string>
196+
</array>
197+
<key>CFBundleTypeIconFile</key>
198+
<string>document.icns</string>
199+
<key>CFBundleTypeName</key>
200+
<string>Subtitles file</string>
201+
<key>CFBundleTypeRole</key>
202+
<string>Viewer</string>
203+
<key>LSTypeIsPackage</key>
204+
<false/>
205+
<key>NSPersistentStoreTypeKey</key>
206+
<string>XML</string>
207+
</dict>
208+
</array>
209+
<key>CFBundleURLTypes</key>
210+
<array>
211+
<dict>
212+
<key>CFBundleTypeRole</key>
213+
<string>Viewer</string>
214+
<key>CFBundleURLName</key>
215+
<string>Streaming Protocol</string>
216+
<key>CFBundleURLSchemes</key>
217+
<array>
218+
<string>mms</string>
219+
<string>mmst</string>
220+
<string>http</string>
221+
<string>httpproxy</string>
222+
<string>rtp</string>
223+
<string>rtsp</string>
224+
<string>ftp</string>
225+
<string>udp</string>
226+
<string>smb</string>
227+
</array>
228+
</dict>
229+
</array>
230+
</dict>
231+
</plist>

‎examples/player/player_sdk.pro

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
QT += sql
1+
TARGET = Player
2+
QT += sql svg
23
########## template for QtAV app project BEGIN ################
34
greaterThan(QT_MAJOR_VERSION, 4) {
45
QT += avwidgets
@@ -22,11 +23,15 @@ RESOURCES += $$COMMON/theme/theme.qrc
2223
isEmpty(PROJECTROOT): PROJECTROOT = $$PWD/../..
2324
mac: RC_FILE = $$PROJECTROOT/src/QtAV.icns
2425
QMAKE_INFO_PLIST = $$COMMON/Info.plist
26+
ios: QMAKE_INFO_PLIST = ios/Info.plist
27+
videos.files = video
28+
videos.path = /
29+
QMAKE_BUNDLE_DATA += videos
2530
defineTest(genRC) {
2631
RC_ICONS = $$PROJECTROOT/src/QtAV.ico
2732
QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
2833
QMAKE_TARGET_DESCRIPTION = "QtAV Multimedia framework. http://qtav.org"
29-
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
34+
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
3035
QMAKE_TARGET_PRODUCT = "QtAV $$1"
3136
export(RC_ICONS)
3237
export(QMAKE_TARGET_COMPANY)

‎qml/libQmlAV.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ EXTRA_COPY_FILES = $$qtav_qml.files
6565
QMAKE_WRITE_DEFAULT_RC = 1
6666
QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
6767
QMAKE_TARGET_DESCRIPTION = "QtAV QML module. QtAV Multimedia framework. http://qtav.org"
68-
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2016 WangBin, [email protected]"
68+
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2012-2017 WangBin, [email protected]"
6969
QMAKE_TARGET_PRODUCT = "QtAV QML"
7070

7171
SOURCES += \

‎qtc_packaging/ifw/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ cd -
203203

204204
### player
205205
echo "coping player files..."
206-
mv $RT_DIR/data/bin/{player${EXE},QMLPlayer${EXE}} $TARGET/packages/com.qtav.product.player/data/bin
206+
mv $RT_DIR/data/bin/{Player${EXE},QMLPlayer${EXE}} $TARGET/packages/com.qtav.product.player/data/bin
207207

208208
### examples
209209
echo "coping examples..."

0 commit comments

Comments
 (0)