Merge "Parse gapless info from mp4 files" (ceb0909b) · Commits · e / os / android_frameworks_base

media/libstagefright/MPEG4Extractor.cpp

+45 −0

Original line number	Diff line number	Diff line
		@@ -599,6 +599,7 @@ static void convertTimeToDate(int64_t time_1904, String8 *s) {
		}

		status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		ALOGV("entering parseChunk %lld/%d", *offset, depth);
		uint32_t hdr[2];
		if (mDataSource->readAt(*offset, hdr, 8) < 8) {
		return ERROR_IO;
		@@ -625,6 +626,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {

		char chunk[5];
		MakeFourCCString(chunk_type, chunk);
		ALOGV("chunk: %s @ %lld", chunk, *offset);

		#if 0
		static const char kWhitespace[] = " ";
		@@ -1302,6 +1304,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		break;
		}

		case FOURCC('m', 'e', 'a', 'n'):
		case FOURCC('n', 'a', 'm', 'e'):
		case FOURCC('d', 'a', 't', 'a'):
		{
		if (mPath.size() == 6 && underMetaDataPath(mPath)) {
		@@ -1437,6 +1441,15 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		break;
		}

		case FOURCC('-', '-', '-', '-'):
		{
		mLastCommentMean.clear();
		mLastCommentName.clear();
		mLastCommentData.clear();
		*offset += chunk_size;
		break;
		}

		default:
		{
		*offset += chunk_size;
		@@ -1553,6 +1566,9 @@ status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {
		uint32_t flags = U32_AT(buffer);

		uint32_t metadataKey = 0;
		char chunk[5];
		MakeFourCCString(mPath[4], chunk);
		ALOGV("meta: %s @ %lld", chunk, offset);
		switch (mPath[4]) {
		case FOURCC(0xa9, 'a', 'l', 'b'):
		{
		@@ -1632,6 +1648,35 @@ status_t MPEG4Extractor::parseMetaData(off64_t offset, size_t size) {
		}
		break;
		}
		case FOURCC('-', '-', '-', '-'):
		{
		buffer[size] = '\0';
		switch (mPath[5]) {
		case FOURCC('m', 'e', 'a', 'n'):
		mLastCommentMean.setTo((const char *)buffer + 4);
		break;
		case FOURCC('n', 'a', 'm', 'e'):
		mLastCommentName.setTo((const char *)buffer + 4);
		break;
		case FOURCC('d', 'a', 't', 'a'):
		mLastCommentData.setTo((const char *)buffer + 8);
		break;
		}
		if (mLastCommentMean == "com.apple.iTunes"
		&& mLastCommentName == "iTunSMPB"
		&& mLastCommentData.length() != 0) {
		int32_t delay, padding;
		if (sscanf(mLastCommentData,
		" %x %x %x %x", &delay, &padding) == 2) {
		mLastTrack->meta->setInt32(kKeyEncoderDelay, delay);
		mLastTrack->meta->setInt32(kKeyEncoderPadding, padding);
		}
		mLastCommentMean.clear();
		mLastCommentName.clear();
		mLastCommentData.clear();
		}
		break;
		}

		default:
		break;

media/libstagefright/include/MPEG4Extractor.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@

		#include <media/stagefright/MediaExtractor.h>
		#include <utils/Vector.h>
		#include <utils/String8.h>

		namespace android {

		@@ -64,6 +65,9 @@ private:
		sp<MetaData> mFileMetaData;

		Vector<uint32_t> mPath;
		String8 mLastCommentMean;
		String8 mLastCommentName;
		String8 mLastCommentData;

		status_t readMetaData();
		status_t parseChunk(off64_t *offset, int depth);