summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Gehör <pekka.gehor@qt.io>2022-01-07 13:34:18 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-01-24 10:25:51 +0000
commit2b1b9a38ea39f54e14e77a85be0d368219babcf3 (patch)
tree72f30ee5475eb6911f11ae0107b08831f9b62a79
parent9bd6d63c1572bcf1b9ffeaa0fb77162774f7caf3 (diff)
Android: Fix qmlvideo metadata issue
After the fix, metadata of the video shown correctly on MetaData page. Task-number: QTBUG-99038 Change-Id: I3ef2d90c237d1740c550ff4537fe5184a88bea5f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit b2ce9610ce434ce5e779f2ae1ce04260dd0cb5b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml1
-rw-r--r--examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml30
2 files changed, 17 insertions, 14 deletions
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
index d34789c57..82e808feb 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
@@ -60,6 +60,7 @@ VideoOutput {
property alias metaData: mediaPlayer.metaData
property alias playbackRate: mediaPlayer.playbackRate
property alias position: mediaPlayer.position
+ property alias seekable: mediaPlayer.seekable
property alias volume: audioOutput.volume
signal sizeChanged
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
index 32323b910..4af841454 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
@@ -49,6 +49,7 @@
****************************************************************************/
import QtQuick
+import QtMultimedia
Scene {
id: root
@@ -72,61 +73,62 @@ Scene {
id: metadata
Column {
anchors.fill: parent
+ property var videoMetaData: content.contentItem().metaData
Text {
color: "#e0e0e0"
- text: "Title:" + content.contentItem().metaData.title
+ text: "Title:" + videoMetaData.value(MediaMetaData.Title)
}
Text {
color: "#e0e0e0"
- text: "Size:" + content.contentItem().metaData.size
+ text: "Size:" + videoMetaData.value(MediaMetaData.Size)
}
Text {
color: "#e0e0e0"
- text: "Resolution:" + content.contentItem().metaData.resolution
+ text: "Resolution:" + videoMetaData.value(MediaMetaData.Resolution)
}
Text {
color: "#e0e0e0"
- text: "Media type:" + content.contentItem().metaData.mediaType
+ text: "Media type:" + videoMetaData.value(MediaMetaData.MediaType)
}
Text {
color: "#e0e0e0"
- text: "Video codec:" + content.contentItem().metaData.videoCodec
+ text: "Video codec:" + videoMetaData.value(MediaMetaData.VideoCodec)
}
Text {
color: "#e0e0e0"
- text: "Video bit rate:" + content.contentItem().metaData.videoBitRate
+ text: "Video bit rate:" + videoMetaData.value(MediaMetaData.VideoBitRate)
}
Text {
color: "#e0e0e0"
- text: "Video frame rate:" +content.contentItem().metaData.videoFrameRate
+ text: "Video frame rate:" +videoMetaData.value(MediaMetaData.VideoFrameRate)
}
Text {
color: "#e0e0e0"
- text: "Audio codec:" + content.contentItem().metaData.audioCodec
+ text: "Audio codec:" + videoMetaData.value(MediaMetaData.AudioCodec)
}
Text {
color: "#e0e0e0"
- text: "Audio bit rate:" + content.contentItem().metaData.audioBitRate
+ text: "Audio bit rate:" + videoMetaData.value(MediaMetaData.AudioBitRate)
}
Text {
color: "#e0e0e0"
- text: "Date:" + content.contentItem().metaData.date
+ text: "Date:" + videoMetaData.value(MediaMetaData.Date)
}
Text {
color: "#e0e0e0"
- text: "Description:" + content.contentItem().metaData.description
+ text: "Description:" + videoMetaData.value(MediaMetaData.Description)
}
Text {
color: "#e0e0e0"
- text: "Copyright:" + content.contentItem().metaData.copyright
+ text: "Copyright:" + videoMetaData.value(MediaMetaData.Copyright)
}
Text {
color: "#e0e0e0"
- text: "Seekable:" + content.contentItem().metaData.seekable
+ text: "Seekable:" + content.contentItem().seekable
}
Text {
color: "#e0e0e0"
- text: "Orientation:" + content.contentItem().metaData.orientation
+ text: "Orientation:" + videoMetaData.value(MediaMetaData.Orientation)
}
}
}