ATSParser: dequeue pesStartOffset for every access unit. am: b08d83e972 (48b2e3ab) · Commits · e / os / android_frameworks_av

media/libstagefright/mpeg2ts/ATSParser.cpp

+12 −3

Original line number	Diff line number	Diff line
		@@ -701,6 +701,10 @@ status_t ATSParser::Stream::parse(
		}

		mPayloadStarted = true;
		// There should be at most 2 elements in \|mPesStartOffsets\|.
		while (mPesStartOffsets.size() >= 2) {
		mPesStartOffsets.erase(mPesStartOffsets.begin());
		}
		mPesStartOffsets.push_back(offset);
		}

		@@ -1104,15 +1108,20 @@ void ATSParser::Stream::onPayloadData(
		mSource->queueAccessUnit(accessUnit);
		}

		if ((event != NULL) && !found && mQueue->getFormat() != NULL) {
		// Every access unit has a pesStartOffset queued in \|mPesStartOffsets\|.
		off64_t pesStartOffset = -1;
		if (!mPesStartOffsets.empty()) {
		pesStartOffset = *mPesStartOffsets.begin();
		mPesStartOffsets.erase(mPesStartOffsets.begin());
		}

		if (pesStartOffset >= 0 && (event != NULL) && !found && mQueue->getFormat() != NULL) {
		int32_t sync = 0;
		if (accessUnit->meta()->findInt32("isSync", &sync) && sync) {
		int64_t timeUs;
		if (accessUnit->meta()->findInt64("timeUs", &timeUs)) {
		found = true;
		off64_t pesStartOffset = *mPesStartOffsets.begin();
		event->init(pesStartOffset, mSource, timeUs);
		mPesStartOffsets.erase(mPesStartOffsets.begin());
		}
		}
		}