Merge "mpeg2ts: more error tolerance" into mnc-dev (f4b30c20) · Commits · e / os / android_frameworks_av

media/libstagefright/mpeg2ts/ATSParser.cpp

+2 −5

Original line number	Diff line number	Diff line
		@@ -694,7 +694,8 @@ status_t ATSParser::Stream::parse(
		status_t err = flush(event);

		if (err != OK) {
		return err;
		ALOGW("Error (%08x) happened while flushing; we simply discard "
		"the PES packet and continue.", err);
		}
		}

		@@ -996,10 +997,6 @@ status_t ATSParser::Stream::parsePES(ABitReader br, SyncEvent event) {
		return ERROR_MALFORMED;
		}

		if (br->numBitsLeft() < dataLength * 8) {
		return ERROR_MALFORMED;
		}

		onPayloadData(
		PTS_DTS_flags, PTS, DTS, br->data(), dataLength, event);