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

Commit 177a7ad8 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec... 

am 439fe407: Merge "Return error from MPEG4Writer stop() if the check on codec specific data failed" into gingerbread

Merge commit '439fe407' into gingerbread-plus-aosp

* commit '439fe407':
  Return error from MPEG4Writer stop() if the check on codec specific data failed
parents a842d143 439fe407

media/libstagefright/MPEG4Writer.cpp

+26 −0
Original line number Diff line number Diff line
@@ -174,6 +174,9 @@ private: 
    // value, the user-supplied time scale will be used.

    void setTimeScale();



    // Simple validation on the codec specific data

    status_t checkCodecSpecificData() const;



    Track(const Track &);

    Track &operator=(const Track &);

};
@@ -1624,6 +1627,8 @@ status_t MPEG4Writer::Track::threadEntry() { 


    if (mSampleSizes.empty()) {

        err = ERROR_MALFORMED;

    } else if (OK != checkCodecSpecificData()) {

        err = ERROR_MALFORMED;

    }

    mOwner->trackProgressStatus(this, -1, err);
@@ -1833,6 +1838,27 @@ int64_t MPEG4Writer::Track::getEstimatedTrackSizeBytes() const { 
    return mEstimatedTrackSizeBytes;

}



status_t MPEG4Writer::Track::checkCodecSpecificData() const {

    const char *mime;

    CHECK(mMeta->findCString(kKeyMIMEType, &mime));

    if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_AAC, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG4, mime) ||

        !strcasecmp(MEDIA_MIMETYPE_VIDEO_AVC, mime)) {

        if (!mCodecSpecificData ||

            mCodecSpecificDataSize <= 0) {

            // Missing codec specific data

            return ERROR_MALFORMED;

        }

    } else {

        if (mCodecSpecificData ||

            mCodecSpecificDataSize > 0) {

            // Unexepected codec specific data found

            return ERROR_MALFORMED;

        }

    }

    return OK;

}



void MPEG4Writer::Track::writeTrackHeader(

        int32_t trackID, bool use32BitOffset) {

    const char *mime;