Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f2b9af authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

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

am: 2fe99719

Change-Id: Iad57fed08ed58482c138d4ce59f3c21af39bde9f
parents 991f53aa 2fe99719

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+2 −2
Original line number Diff line number Diff line
@@ -182,11 +182,11 @@ void SoftVideoDecoderOMXComponent::updatePortDefinitions(bool updateCrop, bool u 




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(