am 95ca9aa2: Merge "stagefright: use media timestamp for default render timestamp" into mnc-dev (86a6292f) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+2 −7

Original line number	Diff line number	Diff line
		@@ -5202,16 +5202,11 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) {

		int64_t timestampNs = 0;
		if (!msg->findInt64("timestampNs", &timestampNs)) {
		// TODO: it seems like we should use the timestamp
		// in the (media)buffer as it potentially came from
		// an input surface, but we did not propagate it prior to
		// API 20. Perhaps check for target SDK version.
		#if 0
		// use media timestamp if client did not request a specific render timestamp
		if (info->mData->meta()->findInt64("timeUs", &timestampNs)) {
		ALOGV("using buffer PTS of %" PRId64, timestampNs);
		ALOGV("using buffer PTS of %lld", (long long)timestampNs);
		timestampNs *= 1000;
		}
		#endif
		}

		status_t err;

+4 −10

Original line number	Diff line number	Diff line
		@@ -2452,18 +2452,12 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) {
		info->mData->meta()->findInt64("timeUs", &mediaTimeUs);

		int64_t renderTimeNs = 0;
		if (msg->findInt64("timestampNs", &renderTimeNs)) {
		info->mNotify->setInt64("timestampNs", renderTimeNs);
		} else {
		// TODO: it seems like we should use the timestamp
		// in the (media)buffer as it potentially came from
		// an input surface, but we did not propagate it prior to
		// API 20. Perhaps check for target SDK version.
		#if 0
		ALOGV("using buffer PTS of %" PRId64, timestampNs);
		if (!msg->findInt64("timestampNs", &renderTimeNs)) {
		// use media timestamp if client did not request a specific render timestamp
		ALOGV("using buffer PTS of %lld", (long long)mediaTimeUs);
		renderTimeNs = mediaTimeUs * 1000;
		#endif
		}
		info->mNotify->setInt64("timestampNs", renderTimeNs);

		if (mSoftRenderer != NULL) {
		std::list<FrameRenderTracker::Info> doneFrames = mSoftRenderer->render(