Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 697bd76e authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

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

parents e87ebb08 1e0e166e

media/libstagefright/OMXCodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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);