Merge lp:~renatofilho/mediaplayer-app/remove-ffmpeg into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

releasing version 0.20.5

[lp:~renatofilho/mediaplayer-app/remove-ffmpeg]

75. By Renato Araujo Oliveira Filho on 2013-04-19

Only transcode video for thumbnail pipeline.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:74
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/32/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/32
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1199

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/33
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1205

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/mediaplayer-app/remove-ffmpeg]

76. By Renato Araujo Oliveira Filho on 2013-04-22

Replaced test video from mp4 to ogg format.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/35/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/34
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1258

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

You probably need to approve https://code.launchpad.net/~mterry/mediaplayer-app/hud1/+merge/158474 before this can land.

[Michael Terry (mterry)]

Also, don't replace Didier's changelog like that. You can simply add to it. dch should do that for you automatically. And you shouldn't change UNRELEASED to quantal. The auto-uploader will handle that.

[Gustavo Pichorim Boiko (boiko)]

> Also, don't replace Didier's changelog like that. You can simply add to it.
> dch should do that for you automatically. And you shouldn't change UNRELEASED
> to quantal. The auto-uploader will handle that.

I have discussed with Didier and Sergio about that, we don't have the auto-uploader configured for quantal, so we still need to change to quantal in order to get quantal packages released. We are still using quantal for demos.

[lp:~renatofilho/mediaplayer-app/remove-ffmpeg]

77. By Renato Araujo Oliveira Filho on 2013-04-23

Reverted comments removal on changelog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/36

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

review: Approve (continuous-integration)

[lp:~renatofilho/mediaplayer-app/remove-ffmpeg]

78. By Renato Araujo Oliveira Filho on 2013-04-24

Added comments to explain the flags property in playbin2 element.

[Michael Zanetti (mzanetti)]

lgtm

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-19 06:25:20 +0000
+++ debian/changelog	2013-04-24 11:42:26 +0000
@@ -1,8 +1,13 @@
-mediaplayer-app (0.20.4-0ubuntu1) UNRELEASED; urgency=low
+mediaplayer-app (0.20.5) quantal; urgency=low
 
+  [ Didier Roche ]
   * Prepare for daily release
 
- -- Didier Roche <[e-mail]>  Fri, 19 Apr 2013 08:24:49 +0200
+  [ Renato Araujo Oliveira Filho ]
+  * Stop video at EOF
+  * Removed ffmepg codecs from dependency list
+
+ -- Renato Araujo Oliveira Filho <[e-mail]>  Fri, 19 Apr 2013 11:33:59 -0300
 
 mediaplayer-app (0.20.4) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-04-23 16:24:59 +0000
+++ debian/control	2013-04-24 11:42:26 +0000
@@ -22,7 +22,6 @@
 Architecture: i386 amd64 armhf
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         gstreamer0.10-ffmpeg,
          gstreamer0.10-plugins-base,
          gstreamer0.10-plugins-good,
          qtdeclarative5-hud1.0,

=== modified file 'src/thumbnail-pipeline-gst.cpp'
--- src/thumbnail-pipeline-gst.cpp	2013-04-04 21:22:18 +0000
+++ src/thumbnail-pipeline-gst.cpp	2013-04-24 11:42:26 +0000
@@ -124,6 +124,7 @@
         vsink = gst_element_factory_make ("fakesink", "video-fake-sink");
         g_object_set (vsink, "sync", TRUE, NULL);
         g_object_set (m_pipeline,
+                  "flags", 0x00000001, // Make sure to render only the video stream (we do not need audio here)
                   "audio-sink", asink,
                   "video-sink", vsink,
                   NULL);
@@ -160,7 +161,7 @@
 
 // use standard deviation of the histogram to discovery a good image
 bool ThumbnailPipeline::isMeaningful(QImage img)
-{   
+{
     const static int threshold = 15;
     const float average = (img.height() * img.width()) / 256;
     int histogram[256];
@@ -181,7 +182,7 @@
 }
 
 QImage ThumbnailPipeline::request(qint64 time, QSize size, bool skipBlack)
-{    
+{
     if (m_pipeline == 0) {
         qWarning() << "Pipiline not ready";
         return QImage();

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-04-05 13:07:26 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-04-24 11:42:26 +0000
@@ -21,7 +21,7 @@
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
         super(TestPlayerWithVideo, self).setUp()
-        self.launch_app("small.mp4")
+        self.launch_app("small.ogg")
         self.assertThat(self.main_window.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):

=== modified file 'tests/videos/CMakeLists.txt'
--- tests/videos/CMakeLists.txt	2013-04-04 21:22:18 +0000
+++ tests/videos/CMakeLists.txt	2013-04-24 11:42:26 +0000
@@ -1,6 +1,6 @@
 project(sample_videos)
 
-set(MEDIAPLAYER_TEST_VIDEOS small.mp4)
+set(MEDIAPLAYER_TEST_VIDEOS small.ogg)
 
 install(FILES ${MEDIAPLAYER_TEST_VIDEOS}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/media-player/videos

=== removed file 'tests/videos/small.mp4'
Binary files tests/videos/small.mp4	2013-02-21 20:52:29 +0000 and tests/videos/small.mp4	1970-01-01 00:00:00 +0000 differ
=== added file 'tests/videos/small.ogg'
Binary files tests/videos/small.ogg	1970-01-01 00:00:00 +0000 and tests/videos/small.ogg	2013-04-24 11:42:26 +0000 differ