commit a5ec8b0ec9c94fd9474fae1d1d1dc798ae6c4d2d
author Yahan Zhou <yahan@google.com> Wed Aug 16 17:31:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 17:31:16 2017 +0000
tree 5b090399bd9b7a7c474490d9c0e56d8a5ecf1495
parent 4cc3ed57fb42516a0ea5fd4a5af1fbb4249902a7
parent 1be678231c7d1b7ebd83b26cec7d9b3bc88550d1

Merge "SoftVideoDecoderOMXComponent: max-size can be less than size"

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(