Merge "Added support for MPEG2 video in MPEG4Extractor" into mnc-dev (4a4265e9) · Commits · e / os / android_frameworks_av

media/libstagefright/MPEG4Extractor.cpp

100644 → 100755

+13 −1

Original line number	Diff line number	Diff line
		@@ -1665,7 +1665,18 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		return err;
		}
		}
		if (mPath.size() >= 2
		&& mPath[mPath.size() - 2] == FOURCC('m', 'p', '4', 'v')) {
		// Check if the video is MPEG2
		ESDS esds(&buffer[4], chunk_data_size - 4);

		uint8_t objectTypeIndication;
		if (esds.getObjectTypeIndication(&objectTypeIndication) == OK) {
		if (objectTypeIndication >= 0x60 && objectTypeIndication <= 0x65) {
		mLastTrack->meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_MPEG2);
		}
		}
		}
		break;
		}

		@@ -2847,6 +2858,7 @@ status_t MPEG4Extractor::verifyTrack(Track *track) {
		return ERROR_MALFORMED;
		}
		} else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_MPEG4)
		\|\| !strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_MPEG2)
		\|\| !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {
		if (!track->meta->findData(kKeyESDS, &type, &data, &size)
		\|\| type != kTypeESDS) {