summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-01-16 11:30:13 -0800
committerJames Dong <jdong@google.com>2011-01-19 08:33:07 -0800
commitb45c01c2b8588ff431b511151666a55a39f0a6ae (patch)
tree94a766af98d29e9b6d745e42a5f625106267a2e1 /media/libstagefright/MPEG4Extractor.cpp
parent2b4883641e324c50a2ee24c5bd15170c7d31e57d (diff)
downloadframeworks_av-b45c01c2b8588ff431b511151666a55a39f0a6ae.zip
frameworks_av-b45c01c2b8588ff431b511151666a55a39f0a6ae.tar.gz
frameworks_av-b45c01c2b8588ff431b511151666a55a39f0a6ae.tar.bz2
Fix the presentation video resolution when it is different from the actual image resolution of the video.
bug - 3352413 Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index bafa243..aca701d 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -1321,10 +1321,12 @@ status_t MPEG4Extractor::parseTrackHeader(
mLastTrack->meta->setInt32(kKeyRotation, rotationDegrees);
}
-#if 0
+ // Handle presentation display size, which could be different
+ // from the image size indicated by kKeyWidth and kKeyHeight.
uint32_t width = U32_AT(&buffer[dynSize + 52]);
uint32_t height = U32_AT(&buffer[dynSize + 56]);
-#endif
+ mLastTrack->meta->setInt32(kKeyDisplayWidth, width >> 16);
+ mLastTrack->meta->setInt32(kKeyDisplayHeight, height >> 16);
return OK;
}