Merge lp:~nick-dedekind/unity8/inline-dash-videos into lp:unity8

[Nick Dedekind]

Added live video playback in dash previews

Added live video playback in dash previews.
https://docs.google.com/document/d/1iftJ0_Ypw4Hv2n3LO8kiOM7WSfAlQlImHHEPPPIlu_U/edit#heading=h.lo6wjg7251og

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N/A

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
Not yet.

 * Did you have a look at the warnings when running tests? Can they be reduced?
N/A

[Nick Dedekind (nick-dedekind)]

Commented out sections in VideoPlayer is waiting on a design review (may need the ShaderEffect), and the in PreviewInlineVideo.qml is for sharing via content hub.

Will be removed before merging.

[lp:~nick-dedekind/unity8/inline-dash-videos]

1781. By Nick Dedekind on 2015-05-27

removed QtMultimedia req

1782. By Nick Dedekind on 2015-05-27

reverted req removal

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1782
http://jenkins.qa.ubuntu.com/job/unity8-ci/5772/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5772/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Missing copyright headers on the new files

review: Needs Fixing

[lp:~nick-dedekind/unity8/inline-dash-videos]

1783. By Nick Dedekind on 2015-05-27

re-remove qtmultimedia req!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1783
http://jenkins.qa.ubuntu.com/job/unity8-ci/5774/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/52/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/53/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5774/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/inline-dash-videos]

1784. By Nick Dedekind on 2015-06-02

update components version

1785. By Nick Dedekind on 2015-06-08

added copywrite. removed unused code. error handling

[Nick Dedekind (nick-dedekind)]

> Missing copyright headers on the new files

added

[lp:~nick-dedekind/unity8/inline-dash-videos]

1786. By Nick Dedekind on 2015-06-08

more headers

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1784
http://jenkins.qa.ubuntu.com/job/unity8-ci/5792/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/71/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5792/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1786
http://jenkins.qa.ubuntu.com/job/unity8-ci/5801/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/79
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/92
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21060

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5801/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1786
http://jenkins.qa.ubuntu.com/job/unity8-ci/5805/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/83
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/96
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21143

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5805/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Need to clarify with the design team about what the user experience should be when a video is larger than the size of the screen. For example, record a video using the camera-app and then preview the video in this new scope code. You'll notice it doesn't fit on the screen and is a pretty poor UX. I don't think the default behavior is desirable but should the VideoOutput size be scaled down to fit or what?

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Need to clarify with the design team about what the user experience should be
> when a video is larger than the size of the screen. For example, record a
> video using the camera-app and then preview the video in this new scope code.
> You'll notice it doesn't fit on the screen and is a pretty poor UX. I don't
> think the default behavior is desirable but should the VideoOutput size be
> scaled down to fit or what?

PreserveAspectFit, can't see any other reasonable option.

[Jim Hodapp (jhodapp)]

Why wouldn't stretch while shrinking the size of the VideoOutput to shrink it be an option? As long as we shrink it preserving the aspect ratio, it should still look just fine since you're not stretching it larger.

[Nick Dedekind (nick-dedekind)]

> Why wouldn't stretch while shrinking the size of the VideoOutput to shrink it
> be an option? As long as we shrink it preserving the aspect ratio, it should
> still look just fine since you're not stretching it larger.

Not quite sure what you mean here. What are we stretching?
We would scale the video output down to the maximum available space while keeping aspect.

[Jim Hodapp (jhodapp)]

> > Why wouldn't stretch while shrinking the size of the VideoOutput to shrink
> it
> > be an option? As long as we shrink it preserving the aspect ratio, it should
> > still look just fine since you're not stretching it larger.
>
> Not quite sure what you mean here. What are we stretching?
> We would scale the video output down to the maximum available space while
> keeping aspect.

That's precisely what I mean. Apparently it was a bad word day for me. ;)

[lp:~nick-dedekind/unity8/inline-dash-videos]

1787. By Nick Dedekind on 2015-06-15

merged trunk

1788. By Nick Dedekind on 2015-06-19

better handling of sizing

1789. By Nick Dedekind on 2015-06-19

better lazy image scaling

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1789
http://jenkins.qa.ubuntu.com/job/unity8-ci/5838/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/132/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/119
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/85/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/132
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21330

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5838/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

You have bad tags

review: Needs Fixing

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/CMakeLists.txt
1 conflicts encountered.

[lp:~nick-dedekind/unity8/inline-dash-videos]

1790. By Nick Dedekind on 2015-06-23

merged with trunk

[Nick Dedekind (nick-dedekind)]

> You have bad tags

fixed and merged.

[Albert Astals Cid (aacid)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1790
http://jenkins.qa.ubuntu.com/job/unity8-ci/5858/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/139
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/160
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21403

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5858/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/inline-dash-videos]

1791. By Nick Dedekind on 2015-06-25

reverted to sdk 1.2

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1791
http://jenkins.qa.ubuntu.com/job/unity8-ci/5884/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/165
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/193
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21472

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5884/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Should we remove PreviewVideoPlayback.qml since it's unused?

review: Needs Information

[Albert Astals Cid (aacid)]

There's a tst_MediaServices.qml but the test in the cmake file is not there so i can't run
make testMediaServices.

review: Needs Fixing

[Albert Astals Cid (aacid)]

When "fullscreen" one can see the "preview page" below (see Video in http://i.imgur.com/MU2VJeo.png ) is that what design wants? Feels a bit weird to me.

review: Needs Information

[Albert Astals Cid (aacid)]

Text conflict in tests/mocks/QtMultimedia/mediaplayer.cpp
Text conflict in tests/mocks/QtMultimedia/plugin.cpp
2 conflicts encountered.

[Albert Astals Cid (aacid)]

Change the TRANSLATORS to Translators it's what we settled on because previously we were using both and gettext only supports one.

Also run make pot_file to have an updated .pot

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> When "fullscreen" one can see the "preview page" below (see Video in
> http://i.imgur.com/MU2VJeo.png ) is that what design wants? Feels a bit weird
> to me.

I followed the designs and colors specified in https://docs.google.com/document/d/1iftJ0_Ypw4Hv2n3LO8kiOM7WSfAlQlImHHEPPPIlu_U/edit#

So I guess the answer is yes, until we're told otherwise anyway.

[lp:~nick-dedekind/unity8/inline-dash-videos]

1792. By Nick Dedekind on 2015-07-08

merged with trunk

1793. By Nick Dedekind on 2015-07-08

moved inline video to old files

1794. By Nick Dedekind on 2015-07-08

updated translations

[Nick Dedekind (nick-dedekind)]

Fixed comments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1794
http://jenkins.qa.ubuntu.com/job/unity8-ci/5997/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/285/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/236
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/197/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/285
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/285/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21721

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5997/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

The preview looks weird before the thumbnail arrives

http://i.imgur.com/Ppu8J9R.png

Maybe we need some max in the height that also takes into account the play button?

review: Needs Fixing

[lp:~nick-dedekind/unity8/inline-dash-videos]

1795. By Nick Dedekind on 2015-07-09

reverted file changes

1796. By Nick Dedekind on 2015-07-10

use both inline and old video widget

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1796
http://jenkins.qa.ubuntu.com/job/unity8-ci/6018/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/256
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/257
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21786

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6018/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> The preview looks weird before the thumbnail arrives
>
> http://i.imgur.com/Ppu8J9R.png
>
> Maybe we need some max in the height that also takes into account the play
> button?

Should be fixed now. Initial screenshot height is playButton height + gu(2) margin.

[Albert Astals Cid (aacid)]

going back and forth from to a preview of a video that i recorded with the phone ends up in crashes in media-hub and that freezes the dash.

Can we make the media-hub crashing to freeze the dash? Are we waiting for something in a sync manner that should be async?

review: Needs Fixing

[Jim Hodapp (jhodapp)]

Albert: Can you get a back trace of all of the threads plus a threads info
listing and the media-hub.log for the crash?

On Tue, Jul 14, 2015 at 7:23 AM, Albert Astals Cid <
<email address hidden>> wrote:

> Review: Needs Fixing
>
> going back and forth from to a preview of a video that i recorded with the
> phone ends up in crashes in media-hub and that freezes the dash.
>
> Can we make the media-hub crashing to freeze the dash? Are we waiting for
> something in a sync manner that should be async?
> --
>
> https://code.launchpad.net/~nick-dedekind/unity8/inline-dash-videos/+merge/260251
> You are reviewing the proposed merge of
> lp:~nick-dedekind/unity8/inline-dash-videos into lp:unity8.
>

[Albert Astals Cid (aacid)]

> Albert: Can you get a back trace of all of the threads plus a threads info
> listing and the media-hub.log for the crash?

Jim: here it comes

bt of threads: http://paste.ubuntu.com/11878137/
media-hub.log: http://paste.ubuntu.com/11878149/

[Jim Hodapp (jhodapp)]

That looks good, thanks Albert

On Tue, Jul 14, 2015 at 11:12 AM, Albert Astals Cid <
<email address hidden>> wrote:

> > Albert: Can you get a back trace of all of the threads plus a threads
> info
> > listing and the media-hub.log for the crash?
>
> Jim: here it comes
>
> bt of threads: http://paste.ubuntu.com/11878137/
> media-hub.log: http://paste.ubuntu.com/11878149/
> --
>
> https://code.launchpad.net/~nick-dedekind/unity8/inline-dash-videos/+merge/260251
> You are reviewing the proposed merge of
> lp:~nick-dedekind/unity8/inline-dash-videos into lp:unity8.
>

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml
1 conflicts encountered.

review: Needs Fixing

[Albert Astals Cid (aacid)]

You can probably remove
   item.currentIndex = subPageLoader.initialIndex;

Once we merge
    https://code.launchpad.net/~mardy/unity8/lp1433442/+merge/268068

review: Needs Fixing

[Michael Zanetti (mzanetti)]

mardy's branch is merged.

[Albert Astals Cid (aacid)]

Please propose against overlay

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1796
http://jenkins.qa.ubuntu.com/job/unity8-ci/6284/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4201/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/651/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/996/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/314/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/891/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/892/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/523/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/524/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/651/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6284/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Ignore the proposing to overlay, we don't use it anymore, you still have conflicts though

Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in tests/mocks/QtMultimedia/mediaplayer.cpp
Text conflict in tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml
3 conflicts encountered.

review: Needs Fixing

[Michał Sawicz (saviq)]

Text conflict in qml/Dash/GenericScopeView.qml
Text conflict in tests/mocks/QtMultimedia/mediaplayer.cpp
Text conflict in tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml
3 conflicts encountered.

review: Needs Fixing

Unmerged revisions

=== modified file 'qml/Components/LazyImage.qml'
--- qml/Components/LazyImage.qml	2014-09-29 20:55:54 +0000
+++ qml/Components/LazyImage.qml	2015-07-10 14:23:36 +0000
@@ -29,6 +29,7 @@
 
     property real initialWidth: scaleTo == "width" || scaleTo == "fit" ? width : units.gu(10)
     property real initialHeight: scaleTo == "height" || scaleTo == "fit" ? height : units.gu(10)
+    property real lastScaledDimension: scaleTo == "height" || scaleTo == "fit" ? width : height
 
     property alias sourceSize: image.sourceSize
     property alias fillMode: image.fillMode
@@ -157,6 +158,7 @@
                         easing.type: Easing.Linear; duration: UbuntuAnimation.SnapDuration
                     }
                 }
+                ScriptAction { script: { lastScaledDimension = scaleTo == "height" || scaleTo == "fit" ? root.width : root.height } }
             }
         },
 

=== added directory 'qml/Components/MediaServices'
=== added file 'qml/Components/MediaServices/MediaServices.qml'
--- qml/Components/MediaServices/MediaServices.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/MediaServices/MediaServices.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,391 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtMultimedia 5.0
+import Ubuntu.Components 1.2
+
+FocusScope {
+    id: root
+    property var sourceData
+    property string context: ""
+    property list<Action> actions
+    property Item rootItem: QuickUtils.rootItem(root)
+    property var maximumEmbeddedHeight
+
+    property alias header: headerContent.item
+    property alias content: contentLoader.item
+    property alias footer: footerContent.item
+    property alias fullscreen: priv.fullscreen
+
+    signal close();
+
+    onFullscreenChanged: {
+        if (!fullscreen) rotationAction.checked = false;
+    }
+
+    OrientationHelper {
+        id: orientationHelper
+        automaticOrientation: fullscreen
+
+        StateGroup {
+            id: orientationState
+
+            states: [
+                State {
+                    name: "portrait"
+                    when: !rotationAction.checked
+                },
+                State {
+                    name: "landscape"
+                    when: rotationAction.checked
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    to: "landscape"
+                    SequentialAnimation {
+                        PropertyAction { target: orientationHelper; property: "automaticOrientation"; value: false }
+                        PropertyAction { target: orientationHelper; property: "orientationAngle"; value: 90 }
+                        PropertyAction { target: orientationHelper; property: "automaticOrientation"; value: false }
+                    }
+                },
+                Transition {
+                    to: "portrait"
+                    SequentialAnimation {
+                        PropertyAction { target: orientationHelper; property: "automaticOrientation"; value: false }
+                        PropertyAction { target: orientationHelper; property: "orientationAngle"; value: 0 }
+                        PropertyAction { target: orientationHelper; property: "automaticOrientation"; value: fullscreen }
+                    }
+                }
+            ]
+        }
+
+        Loader {
+            id: contentLoader
+
+            sourceComponent: {
+                switch (context) {
+                case "video":
+                    return videoComponent;
+                }
+                return undefined;
+            }
+
+            Rectangle {
+                anchors.fill: parent
+                color: "#1B1B1B"
+                opacity: 0.85
+            }
+
+            Component {
+                id: videoComponent
+                VideoPlayer {
+                    id: player
+                    objectName: "videoPlayer"
+
+                    width: orientationHelper.width
+                    height: orientationHelper.height
+                    maximumEmbeddedHeight: root.maximumEmbeddedHeight
+                    fixedHeight: fullscreen
+                    orientation: orientationState.state == "landscape" ? Qt.LandscapeOrientation : Qt.PortraitOrientation
+
+                    screenshot: {
+                        var screenshot = root.sourceData["screenshot"];
+                        if (screenshot) return screenshot;
+
+                        var source = root.sourceData["source"];
+                        if (source) {
+                            if (source.toString().indexOf("file://") === 0) {
+                                return "image://thumbnailer/" + source.toString().substr(7);
+                            }
+                        }
+                        return "";
+                    }
+
+                    mediaPlayer: footer ? footer.mediaPlayer : null
+
+                    onClicked: {
+                        if (mediaPlayer.availability !== MediaPlayer.Available) return;
+
+                        if (mediaPlayer.playbackState === MediaPlayer.StoppedState) {
+                            mediaPlayer.play();
+                        } else if (controlHideTimer.running) {
+                            if (mediaPlayer.playbackState === MediaPlayer.PlayingState) {
+                                mediaPlayer.pause();
+                            } else {
+                                mediaPlayer.play();
+                            }
+                        } else {
+                            controlHideTimer.restart();
+                        }
+                    }
+                    onPositionChanged: controlHideTimer.restart();
+                }
+            }
+        }
+
+        Loader {
+            id: headerContent
+            anchors {
+                top: contentLoader.top
+                left: parent.left
+                right: parent.right
+                topMargin: -units.gu(6)
+            }
+            height: units.gu(6)
+            visible: false
+
+            // eater
+            MouseArea {
+                anchors.fill: parent
+            }
+
+            Rectangle {
+                anchors.fill: parent
+                color: "#1B1B1B"
+                opacity: 0.85
+                visible: headerContent.status === Loader.Ready
+            }
+
+            sourceComponent: root.fullscreen ? headerComponent : undefined
+
+            Component {
+                id: headerComponent
+
+                MediaServicesHeader {
+                    onGoPrevious: {
+                        rotationAction.checked = false;
+                        root.close();
+                    }
+
+                    component: {
+                        switch (context) {
+                        case "video":
+                            break;
+                        }
+                        return undefined;
+                    }
+                }
+            }
+
+            // If we interact with the bar, reset the hide timer.
+            MouseArea {
+                anchors.fill: parent
+                onPressed: {
+                    mouse.accepted = false
+                    if (controlHideTimer.running) controlHideTimer.restart()
+                }
+            }
+        }
+
+        Loader {
+            id: footerContent
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: contentLoader.bottom
+                bottomMargin: -units.gu(7)
+            }
+            height: units.gu(7)
+            visible: false
+
+            sourceComponent: {
+                switch (context) {
+                case "video":
+                    return videoControlsComponent;
+                }
+                return undefined;
+            }
+            // eater
+            MouseArea {
+                anchors.fill: parent
+            }
+
+            Rectangle {
+                anchors.fill: parent
+                color: "#1B1B1B"
+                opacity: 0.85
+                visible: footerContent.status === Loader.Ready
+            }
+
+            Component {
+                id: videoControlsComponent
+                VideoPlayerControls {
+                    id: controls
+                    objectName: "videoControls"
+
+                    viewAction: rotationAction.enabled ? rotationAction : fullscreenAction
+                    userActions: root.actions
+
+                    mediaPlayer.source: {
+                        if (!root.sourceData) return "";
+
+                        var x = root.sourceData["source"];
+                        if (x.toString().indexOf("video://") === 0) {
+                            return x.toString().substr(6);
+                        }
+                        return x;
+                    }
+                    mediaPlayer.onPlaybackStateChanged: {
+                        controlHideTimer.restart();
+                    }
+
+                    Binding {
+                        target: priv
+                        property: "forceControlsShown"
+
+                        value: (fullscreen && mediaPlayer.playbackState === MediaPlayer.StoppedState) ||
+                               mediaPlayer.playbackState === MediaPlayer.PausedState ||
+                               interacting
+                    }
+
+                    onInteractingChanged:  {
+                        controlHideTimer.restart();
+                    }
+
+                    Binding {
+                        target: header
+                        property: "title"
+                        value: controls.mediaPlayer.metaData.title !== undefined ?
+                                   controls.mediaPlayer.metaData.title :
+                                   controls.mediaPlayer.source.toString().replace(/^.*[\\\/]/, '')
+                        when: header != null
+                    }
+                }
+            }
+
+            // If we interact with the bar, reset the hide timer.
+            MouseArea {
+                z: 1
+                anchors.fill: parent
+                onPressed: {
+                    mouse.accepted = false
+                    if (controlHideTimer.running) controlHideTimer.restart()
+                }
+            }
+        }
+    }
+
+    StateGroup {
+        states: [
+            State {
+                name: "controlsShown"
+                when: priv.forceControlsShown || priv.controlTimerActive
+                PropertyChanges {
+                    target: footerContent
+                    anchors.bottomMargin: 0
+                    visible: true
+                }
+                PropertyChanges {
+                    target: headerContent
+                    anchors.topMargin: 0
+                    visible: true
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                to: "controlsShown"
+                SequentialAnimation {
+                    PropertyAction { target: root; property: "clip"; value: true }
+                    PropertyAction { property: "visible" }
+                    NumberAnimation {
+                        properties: "anchors.bottomMargin,anchors.topMargin"
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                    PropertyAction { target: root; property: "clip"; value: false }
+                }
+            },
+            Transition {
+                from: "controlsShown"
+                SequentialAnimation {
+                    PropertyAction { target: root; property: "clip"; value: true }
+                    NumberAnimation {
+                        properties: "anchors.bottomMargin,anchors.topMargin"
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                    PropertyAction { property: "visible" }
+                    PropertyAction { target: root; property: "clip"; value: false }
+                }
+            }
+        ]
+    }
+
+    StateGroup {
+        states: [
+            State {
+                name: "minimized"
+                when: !priv.fullscreen
+                PropertyChanges { target: root; implicitHeight: content ? content.implicitHeight : 0; }
+            },
+            State {
+                name: "fullscreen"
+                when: priv.fullscreen
+                ParentChange { target: root; parent: rootItem; x: 0; y: 0; width: parent.width; }
+                PropertyChanges { target: root; implicitHeight: root.parent ? root.parent.height : 0; }
+                PropertyChanges { target: fullscreenAction; iconName: "view-restore" }
+            }
+        ]
+
+        transitions: Transition {
+            ParentAnimation {
+                UbuntuNumberAnimation { properties: "x,y,width,implicitHeight"; duration: UbuntuAnimation.FastDuration }
+            }
+        }
+    }
+
+    QtObject {
+        id: priv
+
+        property bool fullscreen: false
+        property bool controlTimerActive: false
+        property bool forceControlsShown: false
+    }
+
+    Timer {
+        id: controlHideTimer
+        objectName: "controlHideTimer"
+        interval: 4000
+        running: false
+
+        onRunningChanged: {
+            if (running) {
+                priv.controlTimerActive = true;
+            }
+        }
+        onTriggered: priv.controlTimerActive = false;
+    }
+
+    Action {
+        id: fullscreenAction
+        enabled: rotationAction.enabled === false
+        iconName: "view-fullscreen"
+
+        onTriggered: priv.fullscreen = !priv.fullscreen
+    }
+
+    Action {
+        id: rotationAction
+        enabled: root.fullscreen === true
+        iconName: "orientation-lock"
+
+        property bool checked: false
+        onTriggered: checked = !checked
+    }
+}

=== added file 'qml/Components/MediaServices/MediaServicesControls.qml'
--- qml/Components/MediaServices/MediaServicesControls.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/MediaServices/MediaServicesControls.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import QtMultimedia 5.0
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Item {
+    id: root
+
+    property alias component: loader.sourceComponent
+
+    signal actionClicked(string action)
+    signal viewModeClicked
+
+    property list<Action> userActions
+    property Action viewAction
+
+    RowLayout {
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.margins: units.gu(2)
+        spacing: units.gu(2)
+
+        AbstractButton {
+            id: actionButton
+            Layout.preferredWidth: units.gu(3)
+            Layout.preferredHeight: units.gu(3)
+            Layout.alignment: Qt.AlignVCenter
+            enabled: action && action.enabled
+
+            Action {
+                id: popupAction
+                iconName: "navigation-menu"
+                onTriggered: userActionsPopup.createObject(root, { "anchors.bottom": root.top })
+            }
+
+            action: {
+                switch (userActions.length) {
+                    case 0:
+                        return null;
+                    case 1:
+                        return userActions[0];
+                    default:
+                        return popupAction;
+                }
+            }
+
+            Icon {
+                anchors.fill: parent
+                visible: actionButton.action && actionButton.action.iconSource !== "" || false
+                source: actionButton.action ? actionButton.action.iconSource : ""
+                color: "#F3F3E7"
+                opacity: actionButton.action && actionButton.action.enabled ? 1.0 : 0.5
+            }
+        }
+
+        Loader {
+            id: loader
+            Layout.fillWidth: true
+            Layout.preferredHeight: units.gu(3)
+        }
+
+        AbstractButton {
+            objectName: "viewActionButton"
+            Layout.preferredWidth: units.gu(3)
+            Layout.preferredHeight: units.gu(3)
+            Layout.alignment: Qt.AlignVCenter
+            enabled: viewAction.enabled
+            action: viewAction
+
+            Icon {
+                anchors.fill: parent
+                visible: viewAction.iconSource !== ""
+                source: viewAction.iconSource
+                color: "#F3F3E7"
+                opacity: viewAction.enabled ? 1.0 : 0.5
+            }
+        }
+    }
+
+    Component {
+        id: userActionsPopup
+
+        Rectangle {
+            id: popup
+            color: "#1B1B1B"
+            width: userActionsColumn.width
+            height: userActionsColumn.height
+
+            InverseMouseArea {
+                id: eventGrabber
+                acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+                anchors.fill: popup
+                propagateComposedEvents: false
+                onWheel: wheel.accepted = true
+
+                onPressed: popup.destroy()
+            }
+
+            Column {
+                id: userActionsColumn
+                spacing: units.gu(1)
+                width: units.gu(31)
+
+                Repeater {
+                    id: actionRepeater
+                    model: userActions
+                    AbstractButton {
+                        action: modelData
+
+                        onClicked: popup.destroy()
+
+                        implicitHeight: units.gu(4) + bottomDividerLine.height
+                        width: parent ? parent.width : units.gu(31)
+
+                        Rectangle {
+                            visible: parent.pressed
+                            anchors {
+                                left: parent.left
+                                right: parent.right
+                                top: parent.top
+                            }
+                            height: parent.height - bottomDividerLine.height
+                            opacity: 0.5
+                        }
+
+                        Icon {
+                            id: actionIcon
+                            visible: "" !== action.iconSource
+                            source: action.iconSource
+                            color: "#F3F3E7"
+                            anchors {
+                                verticalCenter: parent.verticalCenter
+                                verticalCenterOffset: units.dp(-1)
+                                left: parent.left
+                                leftMargin: units.gu(2)
+                            }
+                            width: units.gu(2)
+                            height: units.gu(2)
+                            opacity: action.enabled ? 1.0 : 0.5
+                        }
+
+                        Label {
+                            anchors {
+                                verticalCenter: parent.verticalCenter
+                                verticalCenterOffset: units.dp(-1)
+                                left: actionIcon.visible ? actionIcon.right : parent.left
+                                leftMargin: units.gu(2)
+                                right: parent.right
+                            }
+                            // In the tabs overflow panel there are no icons, and the font-size
+                            //  is medium as opposed to the small font-size in the actions overflow panel.
+                            fontSize: actionIcon.visible ? "small" : "medium"
+                            elide: Text.ElideRight
+                            text: action.text
+                            color: "#F3F3E7"
+                            opacity: action.enabled ? 1.0 : 0.5
+                        }
+
+                        ListItem.ThinDivider {
+                            id: bottomDividerLine
+                            anchors.bottom: parent.bottom
+                            visible: index !== actionRepeater.count - 1
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'qml/Components/MediaServices/MediaServicesHeader.qml'
--- qml/Components/MediaServices/MediaServicesHeader.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/MediaServices/MediaServicesHeader.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+
+Item {
+    id: root
+
+    property alias title: _title.text
+    property alias component: loader.sourceComponent
+
+    signal goPrevious
+
+    RowLayout {
+        id: row
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.margins: units.gu(2)
+        spacing: units.gu(2)
+
+        // eater
+        AbstractButton {
+            id: navigationButton
+            objectName: "navigationButton"
+            Layout.preferredWidth: units.gu(3)
+            Layout.preferredHeight: units.gu(3)
+            Layout.alignment: Qt.AlignVCenter
+
+            Icon {
+                anchors.fill: parent
+                name: "go-previous"
+                color: "#F3F3E7"
+            }
+
+            onTriggered: {
+                root.goPrevious();
+            }
+        }
+
+        Label {
+            id: _title
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignVCenter
+            elide: Text.ElideRight
+            color: "#F3F3E7"
+        }
+
+        Loader {
+            id: loader
+            Layout.alignment: Qt.AlignVCenter
+            Layout.preferredHeight: units.gu(3)
+        }
+    }
+}

=== added file 'qml/Components/MediaServices/VideoPlayer.qml'
--- qml/Components/MediaServices/VideoPlayer.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/MediaServices/VideoPlayer.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtMultimedia 5.0
+import Ubuntu.Components 0.1
+import Ubuntu.Thumbnailer 0.1
+import "../../Components"
+
+Item {
+    id: root
+
+    property alias screenshot: image.source
+    property alias mediaPlayer: videoOutput.source
+    property int orientation: Qt.PortraitOrientation
+    property bool fixedHeight: false
+    property var maximumEmbeddedHeight
+
+    implicitHeight: {
+        if (parent && orientation == Qt.LandscapeOrientation) {
+            return parent.height;
+        }
+        return content.height;
+    }
+
+    signal clicked
+    signal positionChanged
+
+    Item {
+        id: content
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+        height: {
+            if (root.orientation == Qt.LandscapeOrientation || fixedHeight) {
+                return root.height;
+            }
+            var proposedHeight = videoOutput.height;
+            if (maximumEmbeddedHeight !== undefined && maximumEmbeddedHeight < proposedHeight) {
+                return maximumEmbeddedHeight;
+            }
+            return proposedHeight;
+        }
+        clip: image.height > videoOutput.height
+
+        LazyImage {
+            id: image
+            objectName: "screenshot"
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            anchors.verticalCenter: parent.verticalCenter
+            scaleTo: "width"
+            lastScaledDimension: playButton.height + units.gu(2)
+            initialHeight: lastScaledDimension
+
+            visible: !mediaPlayer || mediaPlayer.playbackState === MediaPlayer.StoppedState
+        }
+
+        VideoOutput {
+            id: videoOutput
+            anchors.centerIn: parent
+
+            width: root.width
+            height: {
+                if (fixedHeight) {
+                    return root.height;
+                }
+                var proposedHeight = mediaPlayer && mediaPlayer.metaData.resolution !== undefined ?
+                            (mediaPlayer.metaData.resolution.height / mediaPlayer.metaData.resolution.width) * width :
+                            image.height;
+                if (maximumEmbeddedHeight !== undefined && maximumEmbeddedHeight < proposedHeight) {
+                    return maximumEmbeddedHeight;
+                }
+                return proposedHeight;
+            }
+
+            source: mediaPlayer
+            visible: mediaPlayer && mediaPlayer.playbackState !== MediaPlayer.StoppedState || false
+
+            Connections {
+                target: mediaPlayer
+                onError: {
+                    if (error !== MediaPlayer.NoError) {
+                        errorTimer.restart();
+                    }
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        id: playButton
+        readonly property bool bigButton: parent.width > units.gu(40)
+        anchors.centerIn: content
+        width: bigButton ? units.gu(10) : units.gu(8)
+        height: width
+        visible: mediaPlayer && mediaPlayer.playbackState !== MediaPlayer.PlayingState || false
+        color: "#1B1B1B"
+        opacity: 0.85
+        radius: width/2
+
+        Behavior on width { UbuntuNumberAnimation {} }
+
+        Icon {
+            anchors.fill: parent
+            anchors.margins: units.gu(1)
+            name: errorTimer.running ? "dialog-warning-symbolic" : "media-playback-start"
+            color: "#F3F3E7"
+        }
+    }
+
+    ActivityIndicator {
+        anchors.centerIn: content
+        running: {
+            if (!mediaPlayer) return false;
+            return mediaPlayer.status === MediaPlayer.Stalled ||
+                 (mediaPlayer.playbackState === MediaPlayer.PlayingState && mediaPlayer.status === MediaPlayer.Loading);
+        }
+    }
+
+    MouseArea {
+        id: contentMouseArea
+        anchors.fill: content
+        enabled: !errorTimer.running
+        hoverEnabled: mediaPlayer && mediaPlayer.playbackState !== MediaPlayer.StoppedState || false
+
+        onClicked: root.clicked()
+        onPositionChanged: root.positionChanged()
+    }
+
+    Timer {
+        id: errorTimer
+        interval: 2000
+    }
+}

=== added file 'qml/Components/MediaServices/VideoPlayerControls.qml'
--- qml/Components/MediaServices/VideoPlayerControls.qml	1970-01-01 00:00:00 +0000
+++ qml/Components/MediaServices/VideoPlayerControls.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Layouts 1.1
+import QtMultimedia 5.0
+import Ubuntu.Components 1.2
+
+MediaServicesControls {
+    id: root
+    readonly property alias mediaPlayer: _mediaPlayer
+    property bool interacting: false
+
+    QtObject {
+        id: priv
+
+        function formatProgress(time) {
+            time = Math.floor(time / 1000);
+
+            var secs = time % 60;
+            time = Math.floor(time / 60);
+            var min = time % 60;
+            var hour = Math.floor(time / 60);
+
+            if (secs < 10) secs = "0%1".arg(secs);
+            if (min < 10) min = "0%1".arg(min);
+            if (hour > 0) {
+                // TRANSLATORS: this refers to a duration/remaining time of the video in hours, minutes and seconds,
+                // of which you can change the order.
+                // %1 refers to hours, %2 refers to minutes and %3 refers to seconds.
+                return  i18n.tr("%1:%2:%3").arg(hour).arg(min).arg(secs);
+            } else {
+                // TRANSLATORS: this refers to a duration/remaining time of the video in minutes and seconds,
+                // of which you can change the order.
+                // %1 refers to minutes and %2 refers to seconds.
+                return  i18n.tr("%1:%2").arg(min).arg(secs);
+            }
+        }
+    }
+
+    component: Item {
+        Connections {
+            target: mediaPlayer
+            onPositionChanged: {
+                if (slider.valueGuard) return;
+
+                slider.valueGuard = true;
+                slider.value = mediaPlayer.position;
+                slider.valueGuard = false;
+                if (!slider.pressed) {
+                    positionLabel.text = priv.formatProgress(mediaPlayer.position);
+                }
+            }
+        }
+
+        Binding {
+            target: root
+            property: "interacting"
+            value: slider.pressed
+        }
+
+        Label {
+            id: positionLabel
+            anchors {
+                left: parent.left
+                bottom: parent.bottom
+                bottomMargin: -units.dp(3)
+            }
+            verticalAlignment: Text.AlignBottom
+            fontSize: "x-small"
+            color: "#F3F3E7"
+
+            text: priv.formatProgress(mediaPlayer.position)
+        }
+
+        Slider {
+            id: slider
+            property bool valueGuard: false
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(2)
+            live: true
+            enabled: mediaPlayer.seekable && mediaPlayer.duration > 0
+            minimumValue: 0
+            maximumValue:  mediaPlayer.duration > 0 ? mediaPlayer.duration : 1
+            value: mediaPlayer.position
+
+            onStyleInstanceChanged: {
+                if (__styleInstance) __styleInstance.backgroundColor = "#F3F3E7";
+            }
+
+            onValueChanged: {
+                if (!pressed) return;
+                if (slider.valueGuard) return;
+
+                slider.valueGuard = true;
+                mediaPlayer.seek(value);
+                slider.valueGuard = false;
+            }
+
+            property bool wasPlaying: mediaPlayer.playbackState === MediaPlayer.PlayingState
+            onPressedChanged: {
+                if (pressed) {
+                    wasPlaying = mediaPlayer.playbackState === MediaPlayer.PlayingState
+                    mediaPlayer.pause();
+                } else {
+
+                    positionLabel.text = priv.formatProgress(mediaPlayer.position);
+                    if (wasPlaying) {
+                        mediaPlayer.play();
+                    }
+                }
+            }
+
+            function formatValue(value) {
+                return priv.formatProgress(value);
+            }
+        }
+
+        Label {
+            anchors {
+                right: parent.right
+                bottom: parent.bottom
+                bottomMargin: -units.dp(3)
+            }
+            verticalAlignment: Text.AlignBottom
+            fontSize: "x-small"
+            color: "#F3F3E7"
+
+            text: priv.formatProgress(mediaPlayer.duration)
+        }
+    }
+
+    function getPlaybackState(playbackState) {
+        if (playbackState === MediaPlayer.PlayingState) return "PlayingState";
+        else if (playbackState === MediaPlayer.PausedState) return "PausedState";
+        else if (playbackState === MediaPlayer.StoppedState) return "StoppedState";
+        return "";
+    }
+
+    function getPlayerStatus(status) {
+        if (status === MediaPlayer.NoMedia) return "NoMedia";
+        else if (status === MediaPlayer.Loading) return "Loading";
+        else if (status === MediaPlayer.Loaded) return "Loaded";
+        else if (status === MediaPlayer.Buffering) return "Buffering";
+        else if (status === MediaPlayer.Stalled) return "Stalled";
+        else if (status === MediaPlayer.Buffered) return "Buffered";
+        else if (status === MediaPlayer.EndOfMedia) return "EndOfMedia";
+        else if (status === MediaPlayer.InvalidMedia) return "InvalidMedia";
+        else if (status === MediaPlayer.UnknownStatus) return "UnknownStatus";
+        return "";
+    }
+
+    MediaPlayer {
+        id: _mediaPlayer
+        objectName: "mediaPlayer"
+
+        onError: {
+            if (error !== MediaPlayer.NoError) {
+                stop();
+            }
+        }
+//        onPlaybackStateChanged: console.log("PLAYBACK STATE CHANGED", getPlaybackState(playbackState));
+//        onStatusChanged: console.log("PLAYER STATUS CHANGED", getPlayerStatus(status));
+    }
+}

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-07-03 14:24:08 +0000
+++ qml/Dash/GenericScopeView.qml	2015-07-10 14:23:36 +0000
@@ -762,6 +762,7 @@
                 item.open = Qt.binding(function() { return subPageLoader.open; } )
                 item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )
                 item.model = Qt.binding(function() { return subPageLoader.model; } )
+                item.currentIndex = subPageLoader.initialIndex;
             }
             open = true;
         }

=== added file 'qml/Dash/Previews/PreviewInlineVideo.qml'
--- qml/Dash/Previews/PreviewInlineVideo.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewInlineVideo.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtMultimedia 5.0
+import Ubuntu.Components 1.2
+import Ubuntu.Thumbnailer 0.1
+//import Ubuntu.Content 0.1
+import "../../Components/MediaServices"
+
+/*! \brief Preview widget for video.
+
+    This widget shows video contained in widgetData["source"],
+    with a placeholder screenshot specified by widgetData["screenshot"].
+ */
+
+PreviewWidget {
+    id: root
+    implicitWidth: units.gu(35)
+    implicitHeight: services.height
+
+    property alias rootItem: services.rootItem
+
+    MediaServices {
+        id: services
+        width: parent.width
+
+        context: "video"
+        sourceData: root.isCurrentPreview ? widgetData : undefined
+        fullscreen: false
+        maximumEmbeddedHeight: rootItem.height / 2
+
+        onClose: fullscreen = false
+
+//        actions: [
+//            Action {
+//                text: i18n.tr("Share")
+//                iconSource: "image://theme/share"
+//                onTriggered: sharePicker.visible = true
+//            }
+//        ]
+    }
+
+//    Component {
+//        id: contentItemComp
+//        ContentItem {
+//            url: widgetData["source"]
+//        }
+//    }
+//    ContentPeerPicker {
+//        id: sharePicker
+//        objectName: "sharePickerEvents"
+//        anchors.fill: parent
+//        showTitle: false
+//        visible: false
+//        parent: rootItem
+//        z: 100
+
+//        contentType: ContentType.Videos
+//        handler: ContentHandler.Share
+
+//        onPeerSelected: {
+//            visible = false;
+
+//            var curTransfer = peer.request();
+//            if (curTransfer.state === ContentTransfer.InProgress)
+//            {
+//                var medias = [ contentItemComp.createObject(parent) ]
+//                curTransfer.state = ContentTransfer.Charged;
+//            }
+//        }
+//        onCancelPressed: {
+//            visible = false;
+//        }
+//    }
+}

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2015-07-10 14:23:36 +0000
@@ -61,7 +61,14 @@
             case "reviews": return "PreviewRatingDisplay.qml";
             case "table": return "PreviewTable.qml";
             case "text": return "PreviewTextSummary.qml";
-            case "video": return "PreviewVideoPlayback.qml";
+            case "video": {
+                if (!widgetData) return "";
+                var source = widgetData.hasOwnProperty("source") ? widgetData["source"].toString() : "";
+                if (source.match("^http") !== null) {
+                    return "PreviewVideoPlayback.qml";
+                }
+                return "PreviewInlineVideo.qml";
+            }
             default: return "";
         }
     }

=== modified file 'tests/mocks/QtMultimedia/CMakeLists.txt'
--- tests/mocks/QtMultimedia/CMakeLists.txt	2014-05-02 22:57:21 +0000
+++ tests/mocks/QtMultimedia/CMakeLists.txt	2015-07-10 14:23:36 +0000
@@ -1,8 +1,14 @@
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 add_library(QtMultimedia-qml MODULE
     plugin.cpp
-    audio.cpp
+    mediaplayer.cpp
+    videooutput.cpp
     )
 
-qt5_use_modules(QtMultimedia-qml Qml)
+qt5_use_modules(QtMultimedia-qml Qml Quick)
 
 add_unity8_mock(QtMultimedia 5.0 QtMultimedia TARGETS QtMultimedia-qml)

=== added file 'tests/mocks/QtMultimedia/VideoSurface.qml'
--- tests/mocks/QtMultimedia/VideoSurface.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/QtMultimedia/VideoSurface.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.2
+import QtMultimedia 5.0
+
+Rectangle {
+    id: root
+    property int position: 0
+    property int playbackState: 0
+    property var resolution: { "width": 16, "height": 9 }
+
+    anchors.centerIn: parent
+    color: "black"
+
+    // scale to the parent window.
+    implicitWidth: parent ? aspectScale(Qt.size(resolution.width, resolution.height), Qt.size(parent.width, parent.height)).width : 160
+    implicitHeight: parent ? aspectScale(Qt.size(resolution.width, resolution.height), Qt.size(parent.width, parent.height)).height : 90
+
+    function aspectScale(fromSize, toSize) {
+        var rw = toSize.height * fromSize.width / fromSize.height;
+        var useHeight = (rw <= toSize.width);
+
+        if (useHeight) {
+            return Qt.size(rw, toSize.height);
+        } else {
+            return Qt.size(toSize.width,
+                           toSize.width * (fromSize.height / fromSize.width));
+        }
+    }
+
+    GridView {
+        anchors.fill: parent
+        model: (parent.width / units.gu(5)) * ((parent.height / units.gu(5) + 1))
+        clip: true
+
+        cellHeight: units.gu(5)
+        cellWidth: units.gu(5)
+
+        delegate: Item {
+            width: units.gu(5)
+            height: units.gu(5)
+
+            Rectangle {
+                id: rect
+                color: "red"
+                anchors.fill: parent
+                anchors.margins: units.gu(1)
+
+                Connections {
+                    target: root
+                    onPositionChanged: {
+                        rect.rotation = position/100
+                    }
+                }
+            }
+        }
+    }
+
+    Column {
+        anchors {
+            left: parent.left;
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+        height: units.gu(10)
+
+        Label {
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: {
+                var pos = (position/1000).toFixed(0)
+
+                var m = Math.floor(pos/60);
+                var ss = pos % 60;
+                if (ss >= 10) {
+                    return m + ":" + ss;
+                } else {
+                    return m + ":0" + ss;
+                }
+            }
+            fontSize: "x-large"
+        }
+
+        Label {
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: getPlaybackState(playbackState)
+            fontSize: "x-large"
+        }
+    }
+
+    function getPlaybackState(playbackState) {
+        if (playbackState === MediaPlayer.PlayingState) return "Playing";
+        else if (playbackState === MediaPlayer.PausedState) return "Paused";
+        else if (playbackState === MediaPlayer.StoppedState) return "Stopped";
+        return "";
+    }
+}

=== renamed file 'tests/mocks/QtMultimedia/audio.cpp' => 'tests/mocks/QtMultimedia/mediaplayer.cpp'
--- tests/mocks/QtMultimedia/audio.cpp	2015-06-08 11:37:27 +0000
+++ tests/mocks/QtMultimedia/mediaplayer.cpp	2015-07-10 14:23:36 +0000
@@ -16,57 +16,123 @@
  * Author: Michael Zanetti <[e-mail]>
  */
 
-#include "audio.h"
-
-Audio::Audio(QObject* parent):
-    QObject(parent),
-    m_playbackState(StoppedState)
+#include "mediaplayer.h"
+
+#include <QDebug>
+#include <QSize>
+
+class MetaDataObject: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QVariant title READ title NOTIFY metaDataChanged)
+    Q_PROPERTY(QVariant resolution READ resolution NOTIFY metaDataChanged)
+public:
+    MetaDataObject(MediaPlayer* parent = nullptr)
+        : QObject(parent)
+        , m_source(parent)
+    {
+    }
+
+    QVariant title() const { return getProperty("title"); }
+    QVariant resolution() const { return getProperty("resolution", QSize(640, 640)); }
+
+    QVariant getProperty(const QString& property, QVariant defaultValue = QVariant()) const {
+        MediaDataSource* sourceData = MediaPlayerDataController::instance()->dataForSource(m_source->source());
+        QVariant metaData = sourceData->metaData();
+        return metaData.toMap().value(property, defaultValue);
+    }
+
+Q_SIGNALS:
+    void metaDataChanged();
+
+private:
+    MediaPlayer* m_source;
+};
+
+MediaPlayer::MediaPlayer(QObject* parent)
+    : QObject(parent)
+    , m_playbackState(StoppedState)
+    , m_status(NoMedia)
+    , m_metaData(new MetaDataObject(this))
 {
     qsrand(time(nullptr));
-    m_timer.setInterval(1000);
+    m_timer.setInterval(100);
     connect(&m_timer, SIGNAL(timeout()), SLOT(timerEvent()));
+
+    connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAboutToBeRemoved,
+            this, [this](const QUrl& source) {
+        MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source);
+        if (!dataSource) return;
+
+        disconnect(dataSource, &MediaDataSource::durationChanged, this, &MediaPlayer::durationChanged);
+        disconnect(dataSource, &MediaDataSource::seekableChanged, this, &MediaPlayer::seekableChanged);
+        disconnect(dataSource, &MediaDataSource::availabilityChanged, this, &MediaPlayer::availabilityChanged);
+        disconnect(dataSource, &MediaDataSource::metaDataChanged, m_metaData, &MetaDataObject::metaDataChanged);
+    });
+
+    connect(MediaPlayerDataController::instance(), &MediaPlayerDataController::sourceAdded,
+            this, [this](const QUrl& source) {
+        MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source);
+        if (!dataSource) return;
+
+        connect(dataSource, &MediaDataSource::durationChanged, this, &MediaPlayer::durationChanged);
+        connect(dataSource, &MediaDataSource::seekableChanged,this, &MediaPlayer::seekableChanged);
+        connect(dataSource, &MediaDataSource::availabilityChanged,this, &MediaPlayer::availabilityChanged);
+        connect(dataSource, &MediaDataSource::metaDataChanged, m_metaData, &MetaDataObject::metaDataChanged);
+    });
 }
 
-QUrl Audio::source() const
+QUrl MediaPlayer::source() const
 {
     return m_source;
 }
 
-void Audio::setSource(const QUrl &source)
+void MediaPlayer::setSource(const QUrl &source)
 {
     if (m_source != source) {
         m_source = source;
         Q_EMIT sourceChanged(source);
+        Q_EMIT durationChanged(duration());
+        Q_EMIT seekableChanged(isSeekable());
+        Q_EMIT availabilityChanged(availability());
 
         m_position = 0;
         Q_EMIT positionChanged(m_position);
+        Q_EMIT m_metaData->metaDataChanged();
 
-        m_duration = (qrand() % 20000) + 10000;
-        Q_EMIT durationChanged(m_duration);
+        m_status = availability()==Available ? Loaded : InvalidMedia;
+        Q_EMIT statusChanged();
     }
 }
 
-Audio::PlaybackState Audio::playbackState() const
+MediaPlayer::PlaybackState MediaPlayer::playbackState() const
 {
     return m_playbackState;
 }
 
-int Audio::position() const
+int MediaPlayer::position() const
 {
     return m_position;
 }
 
-int Audio::duration() const
-{
-    return m_duration;
-}
-
-QString Audio::errorString() const
+int MediaPlayer::duration() const
+{
+    MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source());
+    if (dataSource) return dataSource->duration();
+    return 0;
+}
+
+MediaPlayer::Error MediaPlayer::error() const
+{
+    return NoError;
+}
+
+QString MediaPlayer::errorString() const
 {
     return QString();
 }
 
-void Audio::pause()
+void MediaPlayer::pause()
 {
     if (m_playbackState == PlayingState) {
         m_playbackState = PausedState;
@@ -75,7 +141,7 @@
     }
 }
 
-void Audio::play()
+void MediaPlayer::play()
 {
     if (m_playbackState != PlayingState) {
         m_playbackState = PlayingState;
@@ -85,7 +151,7 @@
     }
 }
 
-void Audio::stop()
+void MediaPlayer::stop()
 {
     if (m_playbackState != StoppedState) {
         m_playbackState = StoppedState;
@@ -96,22 +162,143 @@
     }
 }
 
-void Audio::timerEvent()
-{
-    if (m_position + 1000 < m_duration) {
-        m_position += 1000;
+void MediaPlayer::seek(int position)
+{
+    if (status() != Loaded) return;
+    int newPosition = qMin(qMax(0, position), duration());
+    if (newPosition != m_position) {
+        m_position = newPosition;
+        Q_EMIT positionChanged(m_position);
+    }
+
+}
+
+void MediaPlayer::timerEvent()
+{
+    if (m_position + m_timer.interval() < duration()) {
+        m_position +=  m_timer.interval();
         Q_EMIT positionChanged(m_position);
     } else {
-        stop();
+        pause();
     }
 }
 
-Audio::AudioRole Audio::audioRole() const
+MediaPlayer::AudioRole MediaPlayer::audioRole() const
 {
-    return Audio::multimedia;
+    return MediaPlayer::multimedia;
 }
 
-void Audio::setAudioRole(Audio::AudioRole audioRole)
+void MediaPlayer::setAudioRole(MediaPlayer::AudioRole audioRole)
 {
     Q_UNUSED(audioRole);
 }
+
+bool MediaPlayer::isSeekable() const
+{
+    MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source());
+    if (dataSource) return dataSource->isSeekable();
+    return true;
+}
+
+MediaPlayer::Availability MediaPlayer::availability() const
+{
+    MediaDataSource* dataSource = MediaPlayerDataController::instance()->dataForSource(source());
+    if (dataSource) return dataSource->availability();
+    return Available;
+}
+
+QObject *MediaPlayer::metaData() const
+{
+    return m_metaData;
+}
+
+
+MediaDataSource::MediaDataSource(QObject *parent)
+    : QObject(parent)
+    , m_seekable(true)
+    , m_duration((qrand() % 20000) + 10000)
+    , m_availability(MediaPlayer::Available)
+{
+}
+
+MediaDataSource::~MediaDataSource()
+{
+    if (!m_source.isEmpty()) MediaPlayerDataController::instance()->unregisterDataSource(this);
+}
+
+void MediaDataSource::setSource(const QUrl &source)
+{
+    if (m_source != source) {
+        if (!m_source.isEmpty()) MediaPlayerDataController::instance()->unregisterDataSource(this);
+
+        m_source = source;
+
+        if (!m_source.isEmpty()) MediaPlayerDataController::instance()->registerDataSource(this);
+        Q_EMIT sourceChanged();
+    }
+}
+
+void MediaDataSource::setSeekable(bool seekable)
+{
+    if (m_seekable != seekable) {
+        m_seekable = seekable;
+        Q_EMIT seekableChanged(m_seekable);
+    }
+}
+
+void MediaDataSource::setDuration(int duration)
+{
+    if (m_duration != duration) {
+        m_duration = duration;
+        Q_EMIT durationChanged(m_duration);
+    }
+}
+
+void MediaDataSource::setAvailability(MediaPlayer::Availability availability)
+{
+    if (m_availability != availability) {
+        m_availability = availability;
+        Q_EMIT availabilityChanged(m_availability);
+    }
+}
+
+void MediaDataSource::setMetaData(const QVariant& metaData)
+{
+    if (m_metaData != metaData) {
+        m_metaData = metaData;
+        Q_EMIT metaDataChanged();
+    }
+}
+
+MediaPlayerDataController *MediaPlayerDataController::instance()
+{
+    static MediaPlayerDataController* instance = nullptr;
+    if (!instance) { instance = new MediaPlayerDataController(); }
+    return instance;
+}
+
+void MediaPlayerDataController::registerDataSource(MediaDataSource *dataSource)
+{
+    m_dataSources[dataSource->source()] = dataSource;
+    Q_EMIT sourceAdded(dataSource->source());
+}
+
+void MediaPlayerDataController::unregisterDataSource(MediaDataSource *dataSource)
+{
+    QList<QUrl> keys = m_dataSources.keys(dataSource);
+    Q_FOREACH(const QUrl& key, keys) {
+        Q_EMIT sourceAboutToBeRemoved(key);
+        m_dataSources.remove(key);
+    }
+}
+
+MediaDataSource *MediaPlayerDataController::dataForSource(const QUrl &source)
+{
+    if (!m_dataSources.contains(source)) {
+        static MediaDataSource defaultSource;
+        return &defaultSource;
+    }
+    return m_dataSources[source];
+}
+
+#include "mediaplayer.moc"

=== renamed file 'tests/mocks/QtMultimedia/audio.h' => 'tests/mocks/QtMultimedia/mediaplayer.h'
--- tests/mocks/QtMultimedia/audio.h	2015-06-08 11:37:27 +0000
+++ tests/mocks/QtMultimedia/mediaplayer.h	2015-07-10 14:23:36 +0000
@@ -16,24 +16,39 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
-#ifndef MOCK_AUDIO_H
-#define MOCK_AUDIO_H
+#ifndef MOCK_MEDIAPLAYER_H
+#define MOCK_MEDIAPLAYER_H
 
 #include <QObject>
 #include <QUrl>
 #include <QTimer>
-
-class Audio: public QObject
+#include <QHash>
+#include <QVariant>
+
+class MetaDataObject;
+
+class MediaPlayer: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(PlaybackState)
-    Q_ENUMS(AudioRole)
+
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
     Q_PROPERTY(int position READ position NOTIFY positionChanged)
     Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
+    Q_PROPERTY(Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged)
     Q_PROPERTY(AudioRole audioRole READ audioRole WRITE setAudioRole)
+
+    Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
+    Q_PROPERTY(Availability availability READ availability NOTIFY availabilityChanged)
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QObject *metaData READ metaData CONSTANT)
+
+    Q_ENUMS(PlaybackState)
+    Q_ENUMS(AudioRole)
+    Q_ENUMS(Availability)
+    Q_ENUMS(Status)
+    Q_ENUMS(Error)
 public:
     enum PlaybackState {
         PlayingState,
@@ -48,7 +63,35 @@
         phone
     };
 
-    explicit Audio(QObject *parent = 0);
+    enum Availability {
+        Available,
+        Busy,
+        Unavailable,
+        ResourceMissing
+    };
+
+    enum Status {
+        UnknownStatus,
+        NoMedia,
+        Loading,
+        Loaded,
+        Stalled,
+        Buffering,
+        Buffered,
+        EndOfMedia,
+        InvalidMedia
+    };
+
+    enum Error {
+        NoError,
+        ResourceError,
+        FormatError,
+        NetworkError,
+        AccessDeniedError,
+        ServiceMissingError
+    };
+
+    explicit MediaPlayer(QObject *parent = 0);
 
     QUrl source() const;
     void setSource(const QUrl &source);
@@ -59,22 +102,35 @@
 
     int duration() const;
 
+    Error error() const;
     QString errorString() const;
 
     AudioRole audioRole() const;
     void setAudioRole(AudioRole audioRole);
 
+    bool isSeekable() const;
+    MediaPlayer::Availability availability() const;
+    Status status() const { return m_status; }
+    QObject *metaData() const;
+
 public Q_SLOTS:
     void pause();
     void play();
     void stop();
+    void seek(int position);
 
 Q_SIGNALS:
     void sourceChanged(const QUrl &source);
     void playbackStateChanged(PlaybackState playbackState);
     void positionChanged(int position);
     void durationChanged(int duration);
+    void seekableChanged(bool seekable);
+    void errorChanged(Error error);
     void errorStringChanged(const QString &errorString);
+    void availabilityChanged(Availability availability);
+    void statusChanged();
+
+    void error(Error error, const QString &errorString);
 
 private Q_SLOTS:
     void timerEvent();
@@ -84,7 +140,72 @@
     PlaybackState m_playbackState;
     QTimer m_timer;
     int m_position;
+    Status m_status;
+    MetaDataObject *m_metaData;
+};
+
+class MediaDataSource : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(bool seekable READ isSeekable WRITE setSeekable NOTIFY seekableChanged)
+    Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged)
+    Q_PROPERTY(MediaPlayer::Availability availability READ availability WRITE setAvailability NOTIFY availabilityChanged)
+    Q_PROPERTY(QVariant metaData READ metaData WRITE setMetaData NOTIFY metaDataChanged)
+
+public:
+    MediaDataSource(QObject* parent = 0);
+    ~MediaDataSource();
+
+    QUrl source() const { return m_source; }
+    void setSource(const QUrl& source);
+
+    bool isSeekable() const { return m_seekable; }
+    void setSeekable(bool seekable);
+
+    int duration() const { return m_duration; }
+    void setDuration(int duration);
+
+    MediaPlayer::Availability availability() const { return m_availability; }
+    void setAvailability(MediaPlayer::Availability availability);
+
+    QVariant metaData() const { return m_metaData; }
+    void setMetaData(const QVariant& metaData);
+
+Q_SIGNALS:
+    void sourceChanged();
+    void seekableChanged(bool seekable);
+    void durationChanged(int duration);
+    void availabilityChanged(MediaPlayer::Availability availability);
+    void metaDataChanged();
+
+private:
+    QUrl m_source;
+    bool m_seekable;
     int m_duration;
-};
-
-#endif
+    MediaPlayer::Availability m_availability;
+    QVariant m_metaData;
+};
+
+class MediaPlayerDataController : public QObject
+{
+    Q_OBJECT
+public:
+    MediaPlayerDataController() = default;
+
+    static MediaPlayerDataController *instance();
+
+    void registerDataSource(MediaDataSource* dataSource);
+    void unregisterDataSource(MediaDataSource* dataSource);
+
+    MediaDataSource* dataForSource(const QUrl& source);
+
+Q_SIGNALS:
+    void sourceAdded(const QUrl& source);
+    void sourceAboutToBeRemoved(const QUrl& source);
+
+public:
+    QHash<QUrl, MediaDataSource*> m_dataSources;
+};
+
+#endif // MOCK_MEDIAPLAYER_H

=== modified file 'tests/mocks/QtMultimedia/plugin.cpp'
--- tests/mocks/QtMultimedia/plugin.cpp	2015-06-08 11:37:27 +0000
+++ tests/mocks/QtMultimedia/plugin.cpp	2015-07-10 14:23:36 +0000
@@ -17,13 +17,17 @@
  */
 
 #include "plugin.h"
-#include "audio.h"
+#include "mediaplayer.h"
+#include "videooutput.h"
 
 #include <QtQml/qqml.h>
 
 void MockQtMultimediaPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("QtMultimedia"));
-    qmlRegisterType<Audio>(uri, 5, 0, "Audio");
-    qmlRegisterType<Audio>(uri, 5, 0, "MediaPlayer");
+    qmlRegisterType<MediaPlayer>(uri, 5, 0, "Audio");
+    qmlRegisterType<MediaPlayer>(uri, 5, 0, "MediaPlayer");
+    qmlRegisterType<VideoOutput>(uri, 5, 0, "VideoOutput");
+
+    qmlRegisterType<MediaDataSource>(uri, 5, 0, "MediaDataSource");
 }

=== added file 'tests/mocks/QtMultimedia/videooutput.cpp'
--- tests/mocks/QtMultimedia/videooutput.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/QtMultimedia/videooutput.cpp	2015-07-10 14:23:36 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "videooutput.h"
+#include "mediaplayer.h"
+
+#include <paths.h>
+
+#include <QQuickView>
+#include <QQmlComponent>
+#include <QGuiApplication>
+#include <QQmlProperty>
+#include <QQmlEngine>
+
+VideoOutput::VideoOutput(QQuickItem *parent)
+    : QQuickItem(parent)
+    , m_source(nullptr)
+    , m_qmlContentComponent(nullptr)
+    , m_qmlItem(nullptr)
+{
+}
+
+void VideoOutput::setSource(QObject *source)
+{
+    if (m_source != source) {
+        if (m_source) disconnect(m_source, 0, this, 0);
+
+        m_source = source;
+        Q_EMIT sourceChanged();
+
+        MediaPlayer* mediaPlayer = qobject_cast<MediaPlayer*>(source);
+        if (mediaPlayer) {
+            connect(mediaPlayer, &MediaPlayer::positionChanged, this, &VideoOutput::updateProperties);
+            connect(mediaPlayer, &MediaPlayer::playbackStateChanged, this, &VideoOutput::updateProperties);
+            connect(mediaPlayer->metaData(), SIGNAL(metaDataChanged()), this, SLOT(updateProperties()));
+        }
+    }
+}
+
+void VideoOutput::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &value)
+{
+    if (change == QQuickItem::ItemSceneChange && !m_qmlContentComponent) {
+        QWindowList list = QGuiApplication::topLevelWindows();
+        if (list.isEmpty()) return;
+
+        // The assumptions I make here really should hold.
+        QQuickView *quickView =
+            qobject_cast<QQuickView*>(list[0]);
+
+        m_qmlContentComponent = new QQmlComponent(quickView->engine(),
+                                                  QString("%1/QtMultimedia/VideoSurface.qml").arg(mockPluginsDir()));
+
+        switch (m_qmlContentComponent->status()) {
+            case QQmlComponent::Ready:
+                createQmlContentItem();
+                break;
+            case QQmlComponent::Loading:
+                connect(m_qmlContentComponent, &QQmlComponent::statusChanged,
+                        this, &VideoOutput::onComponentStatusChanged);
+                break;
+            case QQmlComponent::Error:
+                printComponentErrors();
+                qFatal("VideoOutput: failed to create content component.");
+                break;
+            default:
+                qFatal("VideoOutput: Unhandled component status");
+        }
+    }
+    QQuickItem::itemChange(change, value);
+}
+
+void VideoOutput::printComponentErrors()
+{
+    QList<QQmlError> errors = m_qmlContentComponent->errors();
+    for (int i = 0; i < errors.count(); ++i) {
+        qDebug() << errors[i];
+    }
+}
+
+void VideoOutput::onComponentStatusChanged(QQmlComponent::Status status)
+{
+    if (status == QQmlComponent::Ready) {
+        createQmlContentItem();
+    }
+}
+
+void VideoOutput::createQmlContentItem()
+{
+    m_qmlItem = qobject_cast<QQuickItem*>(m_qmlContentComponent->create());
+    m_qmlItem->setParentItem(this);
+
+    updateProperties();
+}
+
+void VideoOutput:: updateProperties()
+{
+    if (!m_qmlItem) return;
+
+    MediaPlayer* mediaPlayer = qobject_cast<MediaPlayer*>(m_source);
+    if (!mediaPlayer) return;
+
+    QQmlProperty playbackStateProperty(m_qmlItem, "playbackState");
+    playbackStateProperty.write(QVariant::fromValue<int>(mediaPlayer->playbackState()));
+
+    QQmlProperty positionProperty(m_qmlItem, "position");
+    positionProperty.write(QVariant::fromValue(mediaPlayer->position()));
+
+    QQmlProperty propResSource(mediaPlayer->metaData(), "resolution");
+    QQmlProperty propResDest(m_qmlItem, "resolution");
+
+    if (propResSource.isValid() && propResDest.isValid()) {
+        propResDest.write(propResSource.read());
+    }
+}

=== added file 'tests/mocks/QtMultimedia/videooutput.h'
--- tests/mocks/QtMultimedia/videooutput.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/QtMultimedia/videooutput.h	2015-07-10 14:23:36 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef VIDEOOUTPUT_H
+#define VIDEOOUTPUT_H
+
+#include <QQuickItem>
+#include <QPointer>
+class QQmlComponent;
+
+class VideoOutput : public QQuickItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QObject* source READ source WRITE setSource NOTIFY sourceChanged)
+public:
+    explicit VideoOutput(QQuickItem *parent = 0);
+
+    QObject *source() const { return m_source.data(); }
+    void setSource(QObject *source);
+
+    void itemChange(ItemChange change, const ItemChangeData & value);
+
+Q_SIGNALS:
+    void sourceChanged();
+
+protected Q_SLOTS:
+    void onComponentStatusChanged(QQmlComponent::Status status);
+    void updateProperties();
+
+private:
+    void createQmlContentItem();
+    void printComponentErrors();
+
+    QPointer<QObject> m_source;
+    QQmlComponent* m_qmlContentComponent;
+    QQuickItem* m_qmlItem;
+};
+
+#endif // VIDEOOUTPUT_H

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-06-18 19:23:08 +0000
+++ tests/qmltests/CMakeLists.txt	2015-07-10 14:23:36 +0000
@@ -10,6 +10,7 @@
 add_unity8_qmltest(Components DraggingArea)
 add_unity8_qmltest(Components LazyImage)
 add_unity8_qmltest(Components Lockscreen)
+add_unity8_qmltest(Components MediaServices)
 add_unity8_qmlunittest(Components PhysicalKeysMapper)
 add_unity8_qmltest(Components Rating)
 add_unity8_qmltest(Components ResponsiveGridView)
@@ -30,6 +31,7 @@
 add_unity8_qmltest(Dash/Previews PreviewExpandable)
 add_unity8_qmltest(Dash/Previews PreviewHeader)
 add_unity8_qmltest(Dash/Previews PreviewImageGallery)
+add_unity8_qmltest(Dash/Previews PreviewInlineVideo)
 add_unity8_qmltest(Dash/Previews PreviewPayments)
 add_unity8_qmltest(Dash/Previews PreviewProgress)
 add_unity8_qmltest(Dash/Previews PreviewRatingDisplay)

=== added file 'tests/qmltests/Components/tst_MediaServices.qml'
--- tests/qmltests/Components/tst_MediaServices.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_MediaServices.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import "../../../qml/Components/MediaServices"
+import Unity.Test 0.1 as UT
+import Ubuntu.Components 1.2
+import QtMultimedia 5.0
+
+Rectangle {
+    id: root
+    width: units.gu(70)
+    height: units.gu(80)
+    color: "lightgrey"
+
+    property var sourceData: {
+        "source": "file:///home/nick/Videos/test-mpeg.ogv",
+        "screenshot": Qt.resolvedUrl("../Dash/artwork/avatar.png")
+    }
+
+    property var sourceData2: {
+        "source": "file:///home/nick/Videos/test-mpeg2.ogv",
+        "screenshot": Qt.resolvedUrl("../Dash/artwork/checkers.png")
+    }
+
+    MediaDataSource {
+        source: root.sourceData["source"]
+        duration: 60000
+        metaData: {
+            "title" : "TEST MPEG",
+            "resolution" : { "width": 160, "height": 90 }
+        }
+    }
+
+    MediaDataSource {
+        source: root.sourceData2["source"]
+        duration: 30000
+        metaData: {
+            "title" : "TEST MPEG",
+            "resolution" : { "width": 90, "height": 240 }
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+
+        Rectangle {
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                left: parent.left
+                right: controls.left
+            }
+            color: "darkblue"
+
+            MediaServices {
+                id: services
+                fullscreen: false
+                width: parent.width
+                sourceData: root.sourceData
+                context: "video"
+
+                rootItem: parent
+                maximumEmbeddedHeight: undefined
+            }
+        }
+
+        Rectangle {
+            id: controls
+            color: "darkgrey"
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                right: parent.right
+            }
+            width: units.gu(30)
+
+            Column {
+                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+
+                Button {
+                    text: "Fullscreen"
+                    onClicked: services.fullscreen = !services.fullscreen
+                }
+                UT.MouseTouchEmulationCheckbox {}
+            }
+        }
+    }
+
+    SignalSpy {
+        id: serviceCloseSpy
+        target: services
+        signalName: "close"
+    }
+
+    UT.UnityTestCase {
+        name: "VideoMediaServices"
+        when: windowShown
+
+        property int oldControlTimerInterval: 0;
+
+        function init() {
+            services.sourceData = root.sourceData
+            services.context = "video";
+
+            var controlHideTimer = findInvisibleChild(services, "controlHideTimer");
+            verify(controlHideTimer !== null);
+            oldControlTimerInterval = controlHideTimer.interval;
+        }
+
+        function cleanup() {
+            serviceCloseSpy.clear();
+            services.context = "";
+            services.fullscreen = false;
+            services.maximumEmbeddedHeight = undefined;
+            tryCompareFunction(function() { return services.header ? services.header.visible : false }, false);
+            tryCompareFunction(function() { return services.footer ? services.footer.visible : false }, false);
+
+            var controlHideTimer = findInvisibleChild(services, "controlHideTimer");
+            controlHideTimer.interval = oldControlTimerInterval;
+        }
+
+        function test_videoWidget() {
+            var videoPlayer = findChild(services, "videoPlayer");
+            verify(videoPlayer !== null);
+
+            var videoControls = findChild(services, "videoControls");
+            verify(videoControls !== null);
+        }
+
+        function test_tapVideoPlayerToPlayAndPause() {
+            var videoPlayer = findChild(services, "videoPlayer");
+            verify(videoPlayer !== null)
+            tap(videoPlayer, videoPlayer.width/2, videoPlayer.height/2);
+
+            var mediaPlayer = findInvisibleChild(services, "mediaPlayer");
+            verify(mediaPlayer !== null);
+            compare(mediaPlayer.playbackState, MediaPlayer.PlayingState, "Media player should be playing");
+
+            tap(videoPlayer, videoPlayer.width/2, videoPlayer.height/2);
+            compare(mediaPlayer.playbackState, MediaPlayer.PausedState, "Media player should be playing");
+        }
+
+        function test_fullscreenSwitch() {
+            var mediaPlayer = findInvisibleChild(services, "mediaPlayer");
+            verify(mediaPlayer !== null);
+            mediaPlayer.play();
+            wait(UbuntuAnimation.BriskDuration); // animation
+
+            var button = findChild(services, "viewActionButton");
+            verify(button !== null);
+            tap(button);
+
+            compare(services.fullscreen, true, "Should have switched to fullscreen mode.");
+        }
+
+        function test_HeaderVisibleOnlyWhenFullscreen() {
+            services.fullscreen = false;
+            compare(services.header, null, "Header should be null when not fullscreen");
+            services.fullscreen = true;
+            tryCompareFunction(function() { return services.header !== null }, true);
+        }
+
+        function test_ControlsShowAndHideWhenPlayed() {
+            services.fullscreen = true;
+            var controlHideTimer = findInvisibleChild(services, "controlHideTimer");
+            controlHideTimer.interval = 100;
+
+            var mediaPlayer = findInvisibleChild(services, "mediaPlayer");
+            mediaPlayer.play();
+
+            tryCompare(services.header, "visible", true);
+            tryCompare(services.footer, "visible", true);
+
+            tryCompare(services.header, "visible", false);
+            tryCompare(services.footer, "visible", false);
+        }
+
+        function test_ControlsDontTimeOutWhenPaused() {
+            services.fullscreen = true;
+            var controlHideTimer = findInvisibleChild(services, "controlHideTimer");
+            controlHideTimer.interval = 100;
+
+            var mediaPlayer = findInvisibleChild(services, "mediaPlayer");
+            mediaPlayer.play();
+            mediaPlayer.pause();
+            wait(300);
+
+            compare(services.header.visible, true, "Header should still be visible");
+            compare(services.footer.visible, true, "Footer should still be visible");
+        }
+
+        function test_close() {
+            services.fullscreen = true;
+            var mediaPlayer = findInvisibleChild(services, "mediaPlayer");
+            mediaPlayer.play();
+            mediaPlayer.pause();
+            wait(UbuntuAnimation.BriskDuration); // animation
+
+            var navigationButton = findChild(services, "navigationButton");
+            verify(navigationButton !== null);
+
+            tap(navigationButton);
+            compare(serviceCloseSpy.count, 1, "close was not called");
+        }
+
+        function test_maximumVideoSize() {
+            services.maximumEmbeddedHeight = root.height / 2
+            services.sourceData = root.sourceData2
+            verify(services.content !== null);
+            tryCompare(services.content, "height", root.height/2);
+        }
+    }
+}

=== added file 'tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewInlineVideo.qml	2015-07-10 14:23:36 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import "../../../../qml/Dash/Previews"
+import Unity.Test 0.1 as UT
+import Ubuntu.Components 1.2
+import QtMultimedia 5.0
+
+Rectangle {
+    width: units.gu(70)
+    height: units.gu(80)
+    color: "lightgrey"
+
+    property var widgetData0: {
+        "source": "file:///test-video1",
+        "screenshot": Qt.resolvedUrl("../artwork/avatar.png")
+    }
+
+    property var widgetData1: {
+        "source": "file:///test-video2",
+        "screenshot": "file:///test-video2-screenshot"
+    }
+
+    MediaDataSource {
+        source: "file:///test-video1"
+        duration: 6000000
+        metaData: {
+            "title" : "TEST MPEG",
+            "resolution" : { "width": 1920, "height": 1080 }
+        }
+    }
+
+    Item {
+        anchors.fill: parent
+
+        Item {
+            id: inner
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                left: parent.left
+                right: controls.left
+            }
+
+            Item {
+                anchors.fill: parent
+                anchors.margins: units.gu(2)
+
+                PreviewInlineVideo {
+                    id: videoPlayback
+                    width: parent.width
+                    widgetData: widgetData0
+
+                    rootItem: inner
+                }
+            }
+
+        }
+
+        Rectangle {
+            id: controls
+            color: "darkgrey"
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                right: parent.right
+            }
+            width: units.gu(30)
+
+            Column {
+                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
+
+                UT.MouseTouchEmulationCheckbox {}
+            }
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "PreviewInlineVideoTest"
+        when: windowShown
+
+        function test_loadScreenshot() {
+            var screenshot = findChild(videoPlayback, "screenshot");
+            verify(screenshot !== null);
+
+            videoPlayback.widgetData = widgetData1;
+            var screenshotSource = screenshot.source
+            compare(screenshotSource.toString(), "file:///test-video2-screenshot");
+        }
+    }
+}

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-08-26 19:21:31 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2015-07-10 14:23:36 +0000
@@ -75,24 +75,25 @@
 
         function test_mapping_data() {
             return [
-                { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
-                { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },
-                { tag: "Expandable", type: "expandable", source: "PreviewExpandable.qml" },
-                { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
-                { tag: "Header", type: "header", source: "PreviewHeader.qml" },
-                { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
-                { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },
-                { tag: "Rating Input", type: "rating-input", source: "PreviewRatingInput.qml" },
-                { tag: "Rating Display", type: "reviews", source: "PreviewRatingDisplay.qml" },
-                { tag: "Table", type: "table", source: "PreviewTable.qml" },
-                { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
-                { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
+                { tag: "Actions", data: { type: "actions" }, source: "PreviewActions.qml" },
+                { tag: "Audio", data: { type: "audio" }, source: "PreviewAudioPlayback.qml" },
+                { tag: "Expandable", data: { type: "expandable" }, source: "PreviewExpandable.qml" },
+                { tag: "Gallery", data: { type: "gallery" }, source: "PreviewImageGallery.qml" },
+                { tag: "Header", data: { type: "header" }, source: "PreviewHeader.qml" },
+                { tag: "Image", data: { type: "image" }, source: "PreviewZoomableImage.qml" },
+                { tag: "Progress", data: { type: "progress" }, source: "PreviewProgress.qml" },
+                { tag: "Rating Input", data: { type: "rating-input" }, source: "PreviewRatingInput.qml" },
+                { tag: "Rating Display", data: { type: "reviews" }, source: "PreviewRatingDisplay.qml" },
+                { tag: "Table", data: { type: "table" }, source: "PreviewTable.qml" },
+                { tag: "Text", data: { type: "text" }, source: "PreviewTextSummary.qml" },
+                { tag: "Video", data: { type: "video" }, source: "PreviewInlineVideo.qml" },
+                { tag: "Video", data: { type: "video", source: "http://demo" }, source: "PreviewVideoPlayback.qml" },
             ];
         }
 
         function test_mapping(data) {
-            factory.widgetData = { type: data.type };
-            factory.widgetType = data.type;
+            factory.widgetData = data.data;
+            factory.widgetType = data.data.type;
 
             verify((String(factory.source)).indexOf(data.source) != -1);
         }