Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 30c7e132: am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread

Browse Source 
Merge commit '30c7e132171edf41a787d6e29d169ac467f6f1ae'

* commit '30c7e132171edf41a787d6e29d169ac467f6f1ae':
  Use the advertised profile and level from M4V and H263 video encoders
This commit is contained in:
James Dong
2010-09-23 10:24:37 -07:00
committed by Android Git Automerger
parent f39b2cfadb 30c7e13217
commit a03f8fb7d0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/OMXCodec.cpp
View File

@@ -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);