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

Commit a9d2f9fb authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev

parents 80c57d57 4e865a3c

include/media/stagefright/ACodec.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ private: 
    sp<ANativeWindow> mNativeWindow;

    sp<AMessage> mInputFormat;

    sp<AMessage> mOutputFormat;

    sp<AMessage> mBaseOutputFormat;



    Vector<BufferInfo> mBuffers[2];

    bool mPortEOS[2];

media/libstagefright/ACodec.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ status_t ACodec::configureCodec( 
    }



    sp<AMessage> inputFormat = new AMessage();

    sp<AMessage> outputFormat = new AMessage();

    sp<AMessage> outputFormat = mNotify->dup(); // will use this for kWhatOutputFormatChanged



    mIsEncoder = encoder;
@@ -1543,6 +1543,8 @@ status_t ACodec::configureCodec( 
        err = setMinBufferSize(kPortIndexInput, 8192);  // XXX

    }



    mBaseOutputFormat = outputFormat;



    CHECK_EQ(getPortFormat(kPortIndexInput, inputFormat), (status_t)OK);

    CHECK_EQ(getPortFormat(kPortIndexOutput, outputFormat), (status_t)OK);

    mInputFormat = inputFormat;
@@ -3533,7 +3535,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
}



void ACodec::sendFormatChange(const sp<AMessage> &reply) {

    sp<AMessage> notify = mNotify->dup();

    sp<AMessage> notify = mBaseOutputFormat->dup();

    notify->setInt32("what", kWhatOutputFormatChanged);



    CHECK_EQ(getPortFormat(kPortIndexOutput, notify), (status_t)OK);
@@ -4648,6 +4650,7 @@ void ACodec::LoadedState::stateEntered() { 
    mCodec->mRepeatFrameDelayUs = -1ll;

    mCodec->mInputFormat.clear();

    mCodec->mOutputFormat.clear();

    mCodec->mBaseOutputFormat.clear();



    if (mCodec->mShutdownInProgress) {

        bool keepComponentAllocated = mCodec->mKeepComponentAllocated;