diff options
author | James Dong <jdong@google.com> | 2010-09-16 11:47:17 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:47:17 -0700 |
commit | eafc0ea74b2929e6d7704320b1bf910e6ef162be (patch) | |
tree | e91b263f9404c32744502408303b4aa79ed57234 /media | |
parent | f868457219ca363d94d48d94ae6be39d7239052f (diff) | |
parent | 0270f47ffeee4907ba1626f6871f5157e529e54e (diff) | |
download | frameworks_av-eafc0ea74b2929e6d7704320b1bf910e6ef162be.zip frameworks_av-eafc0ea74b2929e6d7704320b1bf910e6ef162be.tar.gz frameworks_av-eafc0ea74b2929e6d7704320b1bf910e6ef162be.tar.bz2 |
am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread
Merge commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b' into gingerbread-plus-aosp
* commit 'a7f5e476d54e6f7da588909d370580c3e3457e9b':
Fixed a bug in the query to the supported profiles and levels
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 3d25a4b..cd70a3d 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1035,7 +1035,7 @@ status_t OMXCodec::getVideoProfileLevel( mNode, OMX_IndexParamVideoProfileLevelQuerySupported, ¶m, sizeof(param)); - if (err != OK) return err; + if (err != OK) break; int32_t supportedProfile = static_cast<int32_t>(param.eProfile); int32_t supportedLevel = static_cast<int32_t>(param.eLevel); @@ -1043,7 +1043,10 @@ status_t OMXCodec::getVideoProfileLevel( supportedProfile, supportedLevel); if (profile == supportedProfile && - level == supportedLevel) { + level <= supportedLevel) { + // We can further check whether the level is a valid + // value; but we will leave that to the omx encoder component + // via OMX_SetParameter call. profileLevel.mProfile = profile; profileLevel.mLevel = level; return OK; |