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

Commit 7c9ea89c authored by Lajos Molnar's avatar Lajos Molnar
Browse files

MPEG4Writer: allow both input format and stream to specify CSD 

There is a race condition now that MediaCodecSource updates its
output format on output format change, so MPEG4Writer must be able
to support subsequent CSD updates before the first frame.

Bug: 27719322
Change-Id: Ic705c3adddf07af471205adf027b6caef098fa4d
parent a8d309df

media/libstagefright/MPEG4Writer.cpp

+28 −18
Original line number Diff line number Diff line
@@ -2302,6 +2302,7 @@ status_t MPEG4Writer::Track::threadEntry() { 
    const bool hasMultipleTracks = (mOwner->numTracks() > 1);

    int64_t chunkTimestampUs = 0;

    int32_t nChunks = 0;

    int32_t nActualFrames = 0;        // frames containing non-CSD data (non-0 length)

    int32_t nZeroLengthFrames = 0;

    int64_t lastTimestampUs = 0;      // Previous sample time stamp

    int64_t lastDurationUs = 0;       // Between the previous two samples
@@ -2354,7 +2355,13 @@ status_t MPEG4Writer::Track::threadEntry() { 
        int32_t isCodecConfig;

        if (buffer->meta_data()->findInt32(kKeyIsCodecConfig, &isCodecConfig)

                && isCodecConfig) {

            CHECK(!mGotAllCodecSpecificData);

            // if config format (at track addition) already had CSD, keep that

            // UNLESS we have not received any frames yet.

            // TODO: for now the entire CSD has to come in one frame for encoders, even though

            // they need to be spread out for decoders.

            if (mGotAllCodecSpecificData && nActualFrames > 0) {

                ALOGI("ignoring additional CSD for video track after first frame");

            } else {

                mMeta = mSource->getFormat(); // get output format after format change



                if (mIsAvc) {
@@ -2373,6 +2380,7 @@ status_t MPEG4Writer::Track::threadEntry() { 
                    copyCodecSpecificData((const uint8_t *)buffer->data() + buffer->range_offset(),

                            buffer->range_length());

                }

            }



            buffer->release();

            buffer = NULL;
@@ -2381,6 +2389,8 @@ status_t MPEG4Writer::Track::threadEntry() { 
            continue;

        }



        ++nActualFrames;



        // Make a deep copy of the MediaBuffer and Metadata and release

        // the original as soon as we can

        MediaBuffer *copy = new MediaBuffer(buffer->range_length());