diff options
| author | Andreas Huber <andih@google.com> | 2013-05-02 14:19:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-02 14:19:51 -0700 |
| commit | e1f1f400433446c9809d3bf2b9dd038efb120c9b (patch) | |
| tree | 2d22c139ba7061324db8a096e35e82c19f937277 /media | |
| parent | 93f343af103aaad6e2c213047c4545e94b043197 (diff) | |
| parent | 25b089697febaac4f699bb7ae68ad3839c4df5ab (diff) | |
| download | frameworks_av-e1f1f400433446c9809d3bf2b9dd038efb120c9b.zip frameworks_av-e1f1f400433446c9809d3bf2b9dd038efb120c9b.tar.gz frameworks_av-e1f1f400433446c9809d3bf2b9dd038efb120c9b.tar.bz2 | |
am 00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev
* commit '00bbca96684cb995458fedd2e1f9dec5f047100b':
Don't even try to verify the native resolution validity a
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/wifi-display/VideoFormats.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/VideoFormats.cpp b/media/libstagefright/wifi-display/VideoFormats.cpp index d171c6f..da557f7 100644 --- a/media/libstagefright/wifi-display/VideoFormats.cpp +++ b/media/libstagefright/wifi-display/VideoFormats.cpp @@ -249,11 +249,20 @@ bool VideoFormats::parseFormatSpec(const char *spec) { mNativeIndex = native >> 3; mNativeType = (ResolutionType)(native & 7); + bool success; if (mNativeType >= kNumResolutionTypes) { - return false; + success = false; + } else { + success = GetConfiguration( + mNativeType, mNativeIndex, NULL, NULL, NULL, NULL); } - return GetConfiguration(mNativeType, mNativeIndex, NULL, NULL, NULL, NULL); + if (!success) { + ALOGW("sink advertised an illegal native resolution, fortunately " + "this value is ignored for the time being..."); + } + + return true; } AString VideoFormats::getFormatSpec(bool forM4Message) const { |