diff options
| author | James Dong <jdong@google.com> | 2010-09-23 10:24:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 10:24:37 -0700 |
| commit | 8872633927679cfeb77948ba7b562e07e899ef91 (patch) | |
| tree | ad96c55ce8e181a33558625ca16501534037f583 /media/libstagefright/OMXCodec.cpp | |
| parent | cc08406f74b67b1b7e532ef8ed534c0476ced636 (diff) | |
| parent | bf0025d50700fa9693b56035f72a99d0fd23aa9a (diff) | |
| download | frameworks_av-8872633927679cfeb77948ba7b562e07e899ef91.zip frameworks_av-8872633927679cfeb77948ba7b562e07e899ef91.tar.gz frameworks_av-8872633927679cfeb77948ba7b562e07e899ef91.tar.bz2 | |
am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread
Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'
* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
Use the advertised profile and level from M4V and H263 video encoders
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 1b2be41..ccb614c 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1108,8 +1108,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); @@ -1165,8 +1165,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); |