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

Commit f59eae94 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"

parents b44760cf 3503cef0

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+2 −2
Original line number Diff line number Diff line
@@ -353,8 +353,8 @@ void SoftMPEG4::onReset() { 
    }

}



void SoftMPEG4::updatePortDefinitions() {

    SoftVideoDecoderOMXComponent::updatePortDefinitions();

void SoftMPEG4::updatePortDefinitions(bool updateCrop) {

    SoftVideoDecoderOMXComponent::updatePortDefinitions(updateCrop);



    /* We have to align our width and height - this should affect stride! */

    OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(kOutputPortIndex)->mDef;

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ private: 


    status_t initDecoder();



    virtual void updatePortDefinitions();

    virtual void updatePortDefinitions(bool updateCrop = true);

    bool handlePortSettingsChange();



    DISALLOW_EVIL_CONSTRUCTORS(SoftMPEG4);