diff options
| author | Andreas Huber <andih@google.com> | 2013-05-02 21:16:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-02 21:16:23 +0000 |
| commit | 25b089697febaac4f699bb7ae68ad3839c4df5ab (patch) | |
| tree | 47913338204aa981efe479463c91ba4a9e03e0ce /media/libstagefright/wifi-display | |
| parent | 093a1f3a001a5fb3bac011abc2aa376f621c1bfe (diff) | |
| parent | 9f447e90991315c5a09ba6dfa2ef249922dbf781 (diff) | |
| download | frameworks_av-25b089697febaac4f699bb7ae68ad3839c4df5ab.zip frameworks_av-25b089697febaac4f699bb7ae68ad3839c4df5ab.tar.gz frameworks_av-25b089697febaac4f699bb7ae68ad3839c4df5ab.tar.bz2 | |
Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright/wifi-display')
| -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 { |