mediaplayer-app

Merge lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0 into lp:mediaplayer-app

  1. mediaplayer-gst1.0
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 149
Merged at revision: 140
Proposed branch: lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0
Merge into: lp:mediaplayer-app
Diff against target: 199 lines (+29/-21)
8 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-4)
src/CMakeLists.txt (+6/-6)
src/mediaplayer.cpp (+6/-3)
src/qml/player/Controls.qml (+12/-4)
src/qml/player/VideoPlayer.qml (+1/-1)
tests/CMakeLists.txt (+1/-1)
tests/autopilot/mediaplayer_app/tests/test_player_with_video.py (+1/-1)
To merge this branch: bzr merge lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti (community) Approve
Sergio Schvezov Pending
Review via email: mp+187526@code.launchpad.net

This proposal supersedes a proposal from 2013-09-24.

Commit message

* Drop support for thumbnail as we can't depend on gstreamer directly until qtmultimedia supports gst1.0 (currently only the -touch fork supports it)
* Remove gstreamer related packages from build-dependencies

Description of the change

* Use GStreamer 1.x for a package dependency. Allow non-local URLs for playback input.
* Depend on gstreamer1.0-hybris and gstreamer1.0-pulseaudio for the debian package.
* Get rid of the commented out gst-0.10 dependencies.

To test,
$ add-apt-repository ppa:sergiusens/phablet -y # For qtvide node
$ apt-get update
$ apt-get install libqgsttools-p1-touch libqt5multimedia5-touch libqt5multimedia5-touch-plugins libqt5multimediaquick-p5-touch qtdeclarative5-qtmultimedia-touch-plugin qtvideonode-plugin gstreamer1.0-plugins-ugly gstreamer1.0-libav gstreamer1.0-hybris -y

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:141
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/107/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3926
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1505
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/43/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/43
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3989
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3989/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1507
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1507/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1273
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1284

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/107/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote : Posted in a previous version of this proposal

43 === modified file 'po/mediaplayer-app.pot'

Please revert

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/108/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3937/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1522/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4006/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1524/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/108/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/109/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3942/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1530/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4014/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1532/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/109/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Ricardo Salveti (rsalveti) wrote : Posted in a previous version of this proposal

As discussed via IRC, this will only be merged once we also add support for thumbnailing with gst1.0, which renato is taking care of.

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:143
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/110/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3983/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1589/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4069/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1591/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/110/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sergio Schvezov (sergiusens) wrote : Posted in a previous version of this proposal

libgstreamer0.10-dev brought in pkg-config, you need it

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:144
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/111/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3988/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1595/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4075/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1597/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/111/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0 updated
145. By Sergio Schvezov

reAdding libgstreamer1.0-dev

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3993
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4082
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4082/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1604
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1604/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1346
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1357

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/113/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0 updated
146. By Sergio Schvezov

Disabling scene selection

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4015
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1624
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/51
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4107
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1626
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1626/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1363
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1375

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/115/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0 updated
147. By Renato Araujo Oliveira Filho

Avoid show scene selectior due a bug on hybris

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4018
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1627
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4110
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1629
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1629/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1365
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1377

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/116/rebuild

review: Needs Fixing (continuous-integration)
lp:~phablet-team/mediaplayer-app/mediaplayer-gst1.0 updated
148. By Renato Araujo Oliveira Filho

Merged changes.

149. By Renato Araujo Oliveira Filho

Unset model to avoid problems with thumbnails.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4113
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1632
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1380

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/117/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4023
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1633
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4116
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4116/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1635
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1635/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1383

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/118/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

As we decided to drop thumbnail support over IRC/call, this version now works fine for both desktop and touch, and can be integrated separately.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-07-29 11:31:35 +0000
3+++ CMakeLists.txt 2013-09-25 23:20:49 +0000
4@@ -30,7 +30,7 @@
5 find_package(Qt5Quick)
6
7 include(FindPkgConfig)
8-pkg_check_modules(GSTLIB REQUIRED gstreamer-0.10)
9+#pkg_check_modules(GSTLIB REQUIRED gstreamer-1.0)
10
11 # Standard install paths
12 include(GNUInstallDirs)
13
14=== modified file 'debian/control'
15--- debian/control 2013-09-09 14:37:58 +0000
16+++ debian/control 2013-09-25 23:20:49 +0000
17@@ -7,7 +7,7 @@
18 dh-translations,
19 libgl1-mesa-dev[i386 amd64] | libgl-dev[i386 amd64],
20 libgles2-mesa-dev[armhf],
21- libgstreamer0.10-dev,
22+ pkg-config,
23 python,
24 qtbase5-dev,
25 qtdeclarative5-dev,
26@@ -23,9 +23,6 @@
27 Architecture: i386 amd64 armhf
28 Depends: ${misc:Depends},
29 ${shlibs:Depends},
30- gstreamer0.10-plugins-base,
31- gstreamer0.10-plugins-good,
32- gstreamer0.10-ffmpeg,
33 qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
34 qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
35 qtdeclarative5-ubuntu-ui-extras0.1,
36
37=== modified file 'src/CMakeLists.txt'
38--- src/CMakeLists.txt 2013-05-20 19:46:02 +0000
39+++ src/CMakeLists.txt 2013-09-25 23:20:49 +0000
40@@ -5,17 +5,17 @@
41 include_directories(
42 ${CMAKE_BINARY_DIR}
43 ${sdkhelper_SOURCE_DIR}
44- ${GSTLIB_INCLUDE_DIRS}
45+ #${GSTLIB_INCLUDE_DIRS}
46 )
47
48 set(mediaplayer_HDRS
49- thumbnail-provider.h
50- thumbnail-pipeline-gst.h
51+ #thumbnail-provider.h
52+ #thumbnail-pipeline-gst.h
53 mediaplayer.h)
54
55 set(mediaplayer_SRCS
56- thumbnail-provider.cpp
57- thumbnail-pipeline-gst.cpp
58+ #thumbnail-provider.cpp
59+ #thumbnail-pipeline-gst.cpp
60 mediaplayer.cpp
61 main.cpp)
62
63@@ -28,7 +28,7 @@
64
65 target_link_libraries(${MEDIAPLAYER}
66 sdkhelper
67- ${GSTLIB_LDFLAGS}
68+ #${GSTLIB_LDFLAGS}
69 )
70
71 install(TARGETS ${MEDIAPLAYER}
72
73=== modified file 'src/mediaplayer.cpp'
74--- src/mediaplayer.cpp 2013-05-23 20:20:10 +0000
75+++ src/mediaplayer.cpp 2013-09-25 23:20:49 +0000
76@@ -14,7 +14,7 @@
77 * along with this program. If not, see <http://www.gnu.org/licenses/>.
78 */
79 #include "mediaplayer.h"
80-#include "thumbnail-provider.h"
81+//#include "thumbnail-provider.h"
82 #include "sharefile.h"
83
84 #include <QtCore/QDir>
85@@ -77,7 +77,7 @@
86 qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");
87
88 m_view = new QQuickView();
89- m_view->engine()->addImageProvider("video", new ThumbnailProvider);
90+ //m_view->engine()->addImageProvider("video", new ThumbnailProvider);
91 m_view->setColor(QColor("black"));
92 m_view->setResizeMode(QQuickView::SizeRootObjectToView);
93 m_view->setTitle("Media Player");
94@@ -87,7 +87,7 @@
95 uri = QUrl::fromLocalFile(QDir::current().absoluteFilePath(args[1]));
96 }
97
98- // For now we only accept local files
99+ // Check if it's a local file
100 if (uri.isValid() && uri.isLocalFile()) {
101 QFileInfo info(uri.toLocalFile());
102 if (info.exists() && info.isFile()) {
103@@ -95,6 +95,9 @@
104 } else {
105 qWarning() << "File not found:" << uri << info.exists() << info.isFile();
106 }
107+ // Otherwise see if it's a remote stream
108+ } else if (uri.isValid()) {
109+ m_view->rootContext()->setContextProperty("playUri", uri);
110 } else {
111 qWarning() << "Invalid uri:" << uri;
112 }
113
114=== modified file 'src/qml/player/Controls.qml'
115--- src/qml/player/Controls.qml 2013-09-02 08:55:48 +0000
116+++ src/qml/player/Controls.qml 2013-09-25 23:20:49 +0000
117@@ -64,10 +64,16 @@
118
119 property bool parentActive: _controls.active
120
121+ function selectSceneAt(time) {
122+ // SKIP it for now, we need to fix hybris bug #1231147
123+ return
124+ }
125+
126 objectName: "Controls.SceneSelector"
127 opacity: 0
128 visible: opacity > 0
129- model: _sceneSelectorModel
130+ // SKIP it for now, we need to fix hybris bug #1231147
131+ //model: _sceneSelectorModel
132 anchors {
133 left: parent.left
134 right: parent.right
135@@ -84,7 +90,8 @@
136 ParallelAnimation {
137 id: _showAnimation
138
139- running: _sceneSelector.show
140+ // SKIP it for now, we need to fix hybris bug #1231147
141+ running: false //_sceneSelector.show
142 NumberAnimation { target: _sceneSelector; property: "opacity"; to: 1; duration: 175 }
143 NumberAnimation { target: controls; property: "heightOffset"; to: 0; duration: 175 }
144 }
145@@ -92,7 +99,8 @@
146 ParallelAnimation {
147 id: _hideAnimation
148
149- running: !_sceneSelector.show
150+ // SKIP it for now, we need to fix hybris bug #1231147
151+ running: false //!_sceneSelector.show
152 NumberAnimation { target: _sceneSelector; property: "opacity"; to: 0; duration: 175 }
153 NumberAnimation { target: controls; property: "heightOffset"; to: units.gu(2); duration: 175 }
154 }
155@@ -151,7 +159,7 @@
156 Item {
157 id: _timeLineAnchor
158
159- anchors {
160+ anchors {
161 left: _playbackButtom.right
162 leftMargin: units.gu(2)
163 right: _shareButton.left
164
165=== modified file 'src/qml/player/VideoPlayer.qml'
166--- src/qml/player/VideoPlayer.qml 2013-09-03 15:28:59 +0000
167+++ src/qml/player/VideoPlayer.qml 2013-09-25 23:20:49 +0000
168@@ -33,7 +33,7 @@
169 property int pressCount: 0
170 property bool wasPlaying: false
171 property string uri
172- property bool rotating: false
173+ property bool rotating: false
174 property alias controlsActive: _controls.active
175 property bool componentLoaded: false
176
177
178=== modified file 'tests/CMakeLists.txt'
179--- tests/CMakeLists.txt 2013-04-04 22:18:39 +0000
180+++ tests/CMakeLists.txt 2013-09-25 23:20:49 +0000
181@@ -1,4 +1,4 @@
182 add_subdirectory(videos)
183 add_subdirectory(images)
184 add_subdirectory(autopilot)
185-add_subdirectory(unittest)
186+#add_subdirectory(unittest)
187
188=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
189--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-09-10 14:36:10 +0000
190+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py 2013-09-25 23:20:49 +0000
191@@ -74,7 +74,7 @@
192 self.assertProperty(player, playing=True, paused=False)
193 self.assertProperty(playback_buttom, icon="pause")
194
195- @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
196+ @skip("New backend work needed. bug 1231147")
197 def test_scene_selector_visibility(self):
198 self.show_controls()
199 self.pause_video()

Subscribers

People subscribed via source and target branches

to all changes: