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

Commit a5ec8b0e authored by Yahan Zhou's avatar Yahan Zhou Committed by Android (Google) Code Review
Browse files

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

parents 4cc3ed57 1be67823

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(