Merge "TextDescription: Fix to parse ftab box" am: ead28bdf6f (24e908cb) · Commits · e / os / android_frameworks_av

media/libstagefright/timedtext/TextDescriptions.cpp

+52 −28

Original line number	Diff line number	Diff line
		@@ -445,13 +445,33 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions(
		\| (tmpData + 10) << 8 \| (tmpData + 11);
		parcel->writeInt32(rgba);

		// tx3g box contains class FontTableBox() which extends ftab box
		// This information is part of the 3gpp Timed Text Format
		// Specification#: 26.245 / Section: 5.16(Sample Description Format)
		// https://www.3gpp.org/ftp/Specs/archive/26_series/26.245/

		tmpData += 12;
		remaining -= 12;

		if (remaining < 2) {
		if (remaining < 8) {
		return OK;
		}

		size_t subChunkSize = U32_AT(tmpData);
		if(remaining < subChunkSize) {
		return OK;
		}

		uint32_t subChunkType = U32_AT(tmpData + 4);

		if (subChunkType == FOURCC('f', 't', 'a', 'b'))
		{
		tmpData += 8;
		size_t subChunkRemaining = subChunkSize - 8;

		if(subChunkRemaining < 2) {
		return OK;
		}
		size_t dataPos = parcel->dataPosition();

		parcel->writeInt32(KEY_STRUCT_FONT_LIST);
		@@ -459,10 +479,10 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions(
		parcel->writeInt32(count);

		tmpData += 2;
		remaining -= 2;
		subChunkRemaining -= 2;

		for (int i = 0; i < count; i++) {
		if (remaining < 3) {
		if (subChunkRemaining < 3) {
		// roll back
		parcel->setDataPosition(dataPos);
		return OK;
		@@ -471,14 +491,14 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions(
		parcel->writeInt32(U16_AT(tmpData));

		// font name length
		parcel->writeInt32(*(tmpData + 2));

		size_t len = *(tmpData + 2);

		parcel->writeInt32(len);

		tmpData += 3;
		remaining -= 3;
		subChunkRemaining -=3;

		if (remaining < len) {
		if (subChunkRemaining < len) {
		// roll back
		parcel->setDataPosition(dataPos);
		return OK;
		@@ -486,10 +506,14 @@ status_t TextDescriptions::extract3GPPGlobalDescriptions(

		parcel->write(tmpData, len);
		tmpData += len;
		remaining -= len;
		subChunkRemaining -= len;
		}
		tmpData += subChunkRemaining;
		remaining -= subChunkSize;
		} else {
		tmpData += subChunkSize;
		remaining -= subChunkSize;
		}

		// there is a "DisparityBox" after this according to the spec, but we ignore it
		break;
		}
		default: