Merge "MPEG4Writer: Enforce CSD size check only for MPEG-4 audio/video" into nyc-mr1-dev (4995d513) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Writer.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -3030,8 +3030,6 @@ void MPEG4Writer::Track::writeVideoFourCCBox() {
		mOwner->writeInt16(0x18); // depth
		mOwner->writeInt16(-1); // predefined

		CHECK_LT(23 + mCodecSpecificDataSize, 128);

		if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG4, mime)) {
		writeMp4vEsdsBox();
		} else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_H263, mime)) {
		@@ -3151,6 +3149,10 @@ void MPEG4Writer::Track::writeMp4aEsdsBox() {
		void MPEG4Writer::Track::writeMp4vEsdsBox() {
		CHECK(mCodecSpecificData);
		CHECK_GT(mCodecSpecificDataSize, 0);

		// Make sure all sizes encode to a single byte.
		CHECK_LT(23 + mCodecSpecificDataSize, 128);

		mOwner->beginBox("esds");

		mOwner->writeInt32(0); // version=0, flags=0