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

Commit 3a38172e authored by Dichen Zhang's avatar Dichen Zhang Committed by android-build-merger
Browse files

Merge "libstagefright: encoder must exist when source starting." am: bceab46b 

am: b6b8c975

Change-Id: I47cf50f0689c0b7538d9678e470fd9b77072832f
parents 4d94b4a7 b6b8c975

media/libstagefright/MediaCodecSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -761,8 +761,8 @@ status_t MediaCodecSource::feedEncoderInputBuffers() { 
}



status_t MediaCodecSource::onStart(MetaData *params) {

    if (mStopping) {

        ALOGE("Failed to start while we're stopping");

    if (mStopping || mOutput.lock()->mEncoderReachedEOS) {

        ALOGE("Failed to start while we're stopping or encoder already stopped due to EOS error");

        return INVALID_OPERATION;

    }

    int64_t startTimeUs;