commit c2f2b9afb76f932e00f2aaec37c9db551ac4fe4b
author Lajos Molnar <lajos@google.com> Sat Aug 19 03:14:31 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 19 03:14:31 2017 +0000
tree e82da882ff8066096a399b5af56b0439a78970ed
parent 991f53aa6d2f9ca70f15e2f5f56485c7de41a9e2
parent 2fe997199445cf7aaf6b919cafcb2772bd6d2388

Merge "SoftVideoDecoderOMXComponent: max-size can be less than size" into oc-mr1-dev
am: 2fe9971994

Change-Id: Iad57fed08ed58482c138d4ce59f3c21af39bde9f

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
index 24ed981..cb811a0 100644
--- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
+++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
@@ -182,11 +182,11 @@
 
 
 uint32_t SoftVideoDecoderOMXComponent::outputBufferWidth() {
-    return mIsAdaptive ? mAdaptiveMaxWidth : mWidth;
+    return max(mIsAdaptive ? mAdaptiveMaxWidth : 0, mWidth);
 }
 
 uint32_t SoftVideoDecoderOMXComponent::outputBufferHeight() {
-    return mIsAdaptive ? mAdaptiveMaxHeight : mHeight;
+    return max(mIsAdaptive ? mAdaptiveMaxHeight : 0, mHeight);
 }
 
 void SoftVideoDecoderOMXComponent::handlePortSettingsChange(