summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/StagefrightMetadataRetriever.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-07-31 14:41:35 -0700
committerJames Dong <jdong@google.com>2012-07-31 14:46:38 -0700
commit5a81ad893eada20c32596be53dabe203b99bec3c (patch)
treef499f67ddf2abb203f952c84c83f8d9cb017c415 /media/libstagefright/StagefrightMetadataRetriever.cpp
parent25f0d7ba1987de61c75f8c68b19de48e0ad9736c (diff)
downloadframeworks_av-5a81ad893eada20c32596be53dabe203b99bec3c.zip
frameworks_av-5a81ad893eada20c32596be53dabe203b99bec3c.tar.gz
frameworks_av-5a81ad893eada20c32596be53dabe203b99bec3c.tar.bz2
Allows MediaMetadataRetriever to retrieve video rotation angle
o related-to-bug: 6872687 Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
Diffstat (limited to 'media/libstagefright/StagefrightMetadataRetriever.cpp')
-rw-r--r--media/libstagefright/StagefrightMetadataRetriever.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/StagefrightMetadataRetriever.cpp b/media/libstagefright/StagefrightMetadataRetriever.cpp
index 7951496..c9ef4d9 100644
--- a/media/libstagefright/StagefrightMetadataRetriever.cpp
+++ b/media/libstagefright/StagefrightMetadataRetriever.cpp
@@ -462,6 +462,7 @@ void StagefrightMetadataRetriever::parseMetaData() {
int32_t videoWidth = -1;
int32_t videoHeight = -1;
int32_t audioBitrate = -1;
+ int32_t rotationAngle = -1;
// The overall duration is the duration of the longest track.
int64_t maxDurationUs = 0;
@@ -489,6 +490,9 @@ void StagefrightMetadataRetriever::parseMetaData() {
CHECK(trackMeta->findInt32(kKeyWidth, &videoWidth));
CHECK(trackMeta->findInt32(kKeyHeight, &videoHeight));
+ if (!trackMeta->findInt32(kKeyRotation, &rotationAngle)) {
+ rotationAngle = 0;
+ }
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_TEXT_3GPP)) {
const char *lang;
trackMeta->findCString(kKeyMediaLanguage, &lang);
@@ -521,6 +525,9 @@ void StagefrightMetadataRetriever::parseMetaData() {
sprintf(tmp, "%d", videoHeight);
mMetaData.add(METADATA_KEY_VIDEO_HEIGHT, String8(tmp));
+
+ sprintf(tmp, "%d", rotationAngle);
+ mMetaData.add(METADATA_KEY_VIDEO_ROTATION, String8(tmp));
}
if (numTracks == 1 && hasAudio && audioBitrate >= 0) {