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

Commit 1be67823 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

SoftVideoDecoderOMXComponent: max-size can be less than size 

A component can be configured for size that is greater than the
max size. In such case, configure for the larger of these.

Bug: 37101765
Change-Id: I9bf3cd38e34cbedc00c54862d6782f2841ae2ee8
parent f9db68df

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(