summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-22 17:42:09 -0700
committerJames Dong <jdong@google.com>2010-09-22 17:42:09 -0700
commit97e0fcc0cb69692a6c518e2bfaf9892a164e7f58 (patch)
tree6ed5e2ec5f7659ee97c13dffd856bab5d1a7a15a /media
parentfac4895de4ae63928ff0cf2ccece106eb6d33f72 (diff)
downloadframeworks_av-97e0fcc0cb69692a6c518e2bfaf9892a164e7f58.zip
frameworks_av-97e0fcc0cb69692a6c518e2bfaf9892a164e7f58.tar.gz
frameworks_av-97e0fcc0cb69692a6c518e2bfaf9892a164e7f58.tar.bz2
Use the advertised profile and level from M4V and H263 video encoders
This is already the case for AVC video encoder Change-Id: I9cc97a03ab457b4bd0b21832c09f6d0aa7f5fc39
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/OMXCodec.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 33081a9..ac0db18 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1089,8 +1089,8 @@ status_t OMXCodec::setupH263EncoderParameters(const sp<MetaData>& meta) {
// Check profile and level parameters
CodecProfileLevel defaultProfileLevel, profileLevel;
- defaultProfileLevel.mProfile = OMX_VIDEO_H263ProfileBaseline;
- defaultProfileLevel.mLevel = OMX_VIDEO_H263Level45;
+ defaultProfileLevel.mProfile = h263type.eProfile;
+ defaultProfileLevel.mLevel = h263type.eLevel;
err = getVideoProfileLevel(meta, defaultProfileLevel, profileLevel);
if (err != OK) return err;
h263type.eProfile = static_cast<OMX_VIDEO_H263PROFILETYPE>(profileLevel.mProfile);
@@ -1146,8 +1146,8 @@ status_t OMXCodec::setupMPEG4EncoderParameters(const sp<MetaData>& meta) {
// Check profile and level parameters
CodecProfileLevel defaultProfileLevel, profileLevel;
- defaultProfileLevel.mProfile = OMX_VIDEO_MPEG4ProfileSimple;
- defaultProfileLevel.mLevel = OMX_VIDEO_MPEG4Level2;
+ defaultProfileLevel.mProfile = mpeg4type.eProfile;
+ defaultProfileLevel.mLevel = mpeg4type.eLevel;
err = getVideoProfileLevel(meta, defaultProfileLevel, profileLevel);
if (err != OK) return err;
mpeg4type.eProfile = static_cast<OMX_VIDEO_MPEG4PROFILETYPE>(profileLevel.mProfile);