summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/multimedia/platform/darwin/common/avfmetadata.mm8
-rw-r--r--src/multimedia/qmediametadata.cpp1
-rw-r--r--src/multimedia/qmediametadata.h2
3 files changed, 9 insertions, 2 deletions
diff --git a/src/multimedia/platform/darwin/common/avfmetadata.mm b/src/multimedia/platform/darwin/common/avfmetadata.mm
index ea95bcea6..9111df44c 100644
--- a/src/multimedia/platform/darwin/common/avfmetadata.mm
+++ b/src/multimedia/platform/darwin/common/avfmetadata.mm
@@ -142,7 +142,7 @@ const AVMetadataIDs keyToAVMetaDataID[] = {
{ AVMetadataCommonIdentifierArtwork, AVMetadataIdentifieriTunesMetadataCoverArt,
AVMetadataIdentifierQuickTimeMetadataArtwork, nil, nil, nil },
// Orientation
- { nil, nil, AVMetadataIdentifierQuickTimeMetadataDirectionFacing, nil, nil, nil },
+ { nil, nil, AVMetadataIdentifierQuickTimeMetadataVideoOrientation, nil, nil, nil },
// Resolution
{ nil, nil, nil, nil, nil, nil }
};
@@ -334,6 +334,12 @@ static AVMutableMetadataItem *setAVMetadataItemForKey(QMediaMetaData::Key key, c
item.value = lang.toNSString();
break;
}
+ case QMediaMetaData::Orientation: {
+ bool ok;
+ int rotation = value.toInt(&ok);
+ if (ok)
+ item.value = [NSNumber numberWithInt:rotation];
+ }
default: {
switch (value.typeId()) {
case QMetaType::QString: {
diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp
index a12d37b14..8fd0b2d93 100644
--- a/src/multimedia/qmediametadata.cpp
+++ b/src/multimedia/qmediametadata.cpp
@@ -102,6 +102,7 @@ QT_BEGIN_NAMESPACE
\header \li {3,1}
Image and video attributes
+ \row \li Orientation \li The rotation angle of an image or video. \li int
\row \li Resolution \li The dimensions of an image or video. \li QSize
\endtable
diff --git a/src/multimedia/qmediametadata.h b/src/multimedia/qmediametadata.h
index f8fa23098..3890cd7f8 100644
--- a/src/multimedia/qmediametadata.h
+++ b/src/multimedia/qmediametadata.h
@@ -87,8 +87,8 @@ public:
ThumbnailImage,
CoverArtImage,
- Orientation,
+ Orientation,
Resolution
};
Q_ENUM(Key)