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

Merge "Use the advertised profile and level from M4V and H263 video encoders" into gingerbread

Browse Source
This commit is contained in:
James Dong
2010-09-23 10:11:04 -07:00
committed by Android (Google) Code Review
parent e87ebb08fb 1e0e166ebe
commit 697bd76e42
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

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