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
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 @@
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 {