Some cleanups in QVideoSurfaceFormat

Remove the pixel aspect ratio property. It's almost always 1/1 or
something very close to it.

Remove the pseudo property API. If we need to bind this to QML as a value
type there are better ways to do it.

Change-Id: I02f2170b0f1672529e298593a668eb418caed964
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 0 insertions, 10 deletions

diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 63dc4f4e2..92cf6834d 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -1326,7 +1326,6 @@ Module {
         Property { name: "coverArtUrlSmall"; type: "QVariant" }
         Property { name: "coverArtUrlLarge"; type: "QVariant" }
         Property { name: "resolution"; type: "QVariant" }
-        Property { name: "pixelAspectRatio"; type: "QVariant" }
         Property { name: "videoFrameRate"; type: "QVariant" }
         Property { name: "videoBitRate"; type: "QVariant" }
         Property { name: "videoCodec"; type: "QVariant" }
diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 2668cd3fd..c52cc3717 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -1027,7 +1027,6 @@ void QDeclarativeAudio::_q_mediaChanged(const QUrl &)
     \qmlproperty variant QtMultimedia::Audio::metaData.coverArtUrlSmall
     \qmlproperty variant QtMultimedia::Audio::metaData.coverArtUrlLarge
     \qmlproperty variant QtMultimedia::Audio::metaData.resolution
-    \qmlproperty variant QtMultimedia::Audio::metaData.pixelAspectRatio
     \qmlproperty variant QtMultimedia::Audio::metaData.videoFrameRate
     \qmlproperty variant QtMultimedia::Audio::metaData.videoBitRate
     \qmlproperty variant QtMultimedia::Audio::metaData.videoCodec
@@ -1078,7 +1077,6 @@ void QDeclarativeAudio::_q_mediaChanged(const QUrl &)
     \li \c metaData.coverArtUrlSmall - the URL of a small cover art image.
     \li \c metaData.coverArtUrlLarge - the URL of a large cover art image.
     \li \c metaData.resolution - the dimension of an image or video.
-    \li \c metaData.pixelAspectRatio - the pixel aspect ratio of an image or video.
     \li \c metaData.videoFrameRate - the frame rate of the media's video stream.
     \li \c metaData.videoBitRate - the bit rate of the media's video stream in bits per second.
     \li \c metaData.videoCodec - the encoding of the media's video stream.
@@ -1559,7 +1557,6 @@ void QDeclarativeAudio::_q_mediaChanged(const QUrl &)
     \qmlproperty variant QtMultimedia::MediaPlayer::metaData.coverArtUrlSmall
     \qmlproperty variant QtMultimedia::MediaPlayer::metaData.coverArtUrlLarge
     \qmlproperty variant QtMultimedia::MediaPlayer::metaData.resolution
-    \qmlproperty variant QtMultimedia::MediaPlayer::metaData.pixelAspectRatio
     \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoFrameRate
     \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoBitRate
     \qmlproperty variant QtMultimedia::MediaPlayer::metaData.videoCodec
@@ -1610,7 +1607,6 @@ void QDeclarativeAudio::_q_mediaChanged(const QUrl &)
     \li \c metaData.coverArtUrlSmall - the URL of a small cover art image.
     \li \c metaData.coverArtUrlLarge - the URL of a large cover art image.
     \li \c metaData.resolution - the dimension of an image or video.
-    \li \c metaData.pixelAspectRatio - the pixel aspect ratio of an image or video.
     \li \c metaData.videoFrameRate - the frame rate of the media's video stream.
     \li \c metaData.videoBitRate - the bit rate of the media's video stream in bits per second.
     \li \c metaData.videoCodec - the encoding of the media's video stream.
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index f08c14c68..3ed7f49de 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -97,7 +97,6 @@ class QDeclarativeMediaMetaData : public QObject
 //    Q_PROPERTY(QVariant coverArtUrlSmall READ coverArtUrlSmall WRITE setCoverArtUrlSmall NOTIFY metaDataChanged)
 //    Q_PROPERTY(QVariant coverArtUrlLarge READ coverArtUrlLarge WRITE setCoverArtUrlLarge NOTIFY metaDataChanged)
 //    Q_PROPERTY(QVariant resolution READ resolution WRITE setResolution NOTIFY metaDataChanged)
-//    Q_PROPERTY(QVariant pixelAspectRatio READ pixelAspectRatio WRITE setPixelAspectRatio NOTIFY metaDataChanged)
 //    Q_PROPERTY(QVariant videoFrameRate READ videoFrameRate WRITE setVideoFrameRate NOTIFY metaDataChanged)
 //    Q_PROPERTY(QVariant videoBitRate READ videoBitRate WRITE setVideoBitRate NOTIFY metaDataChanged)
 //    Q_PROPERTY(QVariant videoCodec READ videoCodec WRITE setVideoCodec NOTIFY metaDataChanged)
@@ -255,10 +254,6 @@ public:
 //    QVariant resolution() const { return metaData.value(QMediaMetaData::Resolution); }
 //    void setResolution(const QVariant &resolution) {
 //        setMetaData(QMediaMetaData::Resolution, resolution); }
-//    QVariant pixelAspectRatio() const {
-//        return metaData.value(QMediaMetaData::PixelAspectRatio); }
-//    void setPixelAspectRatio(const QVariant &ratio) {
-//        setMetaData(QMediaMetaData::PixelAspectRatio, ratio); }
 //    QVariant videoFrameRate() const { return metaData.value(QMediaMetaData::VideoFrameRate); }
 //    void setVideoFrameRate(const QVariant &rate) {
 //        setMetaData(QMediaMetaData::VideoFrameRate, rate); }