Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev (bd91c0ab) · Commits · e / os / android_frameworks_av

media/libstagefright/wifi-display/MediaSender.cpp

+0 −31

Original line number	Diff line number	Diff line
		@@ -267,37 +267,6 @@ status_t MediaSender::queueAccessUnit(
		tsPackets,
		33 /* packetType */,
		RTPSender::PACKETIZATION_TRANSPORT_STREAM);

		#if 0
		{
		int64_t nowUs = ALooper::GetNowUs();

		int64_t timeUs;
		CHECK(accessUnit->meta()->findInt64("timeUs", &timeUs));

		int64_t delayMs = (nowUs - timeUs) / 1000ll;

		static const int64_t kMinDelayMs = 0;
		static const int64_t kMaxDelayMs = 300;

		const char *kPattern = "########################################";
		size_t kPatternSize = strlen(kPattern);

		int n = (kPatternSize * (delayMs - kMinDelayMs))
		/ (kMaxDelayMs - kMinDelayMs);

		if (n < 0) {
		n = 0;
		} else if ((size_t)n > kPatternSize) {
		n = kPatternSize;
		}

		ALOGI("[%lld]: (%4lld ms) %s\n",
		timeUs / 1000,
		delayMs,
		kPattern + kPatternSize - n);
		}
		#endif
		}

		if (err != OK) {

media/libstagefright/wifi-display/sink/DirectRenderer.cpp

+0 −24

Original line number	Diff line number	Diff line
		@@ -467,8 +467,6 @@ DirectRenderer::DirectRenderer(
		const sp<IGraphicBufferProducer> &bufferProducer)
		: mSurfaceTex(bufferProducer),
		mVideoRenderPending(false),
		mLatencySum(0ll),
		mLatencyCount(0),
		mNumFramesLate(0),
		mNumFrames(0) {
		}
		@@ -476,25 +474,6 @@ DirectRenderer::DirectRenderer(
		DirectRenderer::~DirectRenderer() {
		}

		int64_t DirectRenderer::getAvgLatenessUs() {
		if (mLatencyCount == 0) {
		return 0ll;
		}

		int64_t avgLatencyUs = mLatencySum / mLatencyCount;

		mLatencySum = 0ll;
		mLatencyCount = 0;

		if (mNumFrames > 0) {
		ALOGI("%d / %d frames late", mNumFramesLate, mNumFrames);
		mNumFramesLate = 0;
		mNumFrames = 0;
		}

		return avgLatencyUs;
		}

		void DirectRenderer::onMessageReceived(const sp<AMessage> &msg) {
		switch (msg->what()) {
		case kWhatDecoderNotify:
		@@ -632,9 +611,6 @@ void DirectRenderer::onRenderVideo() {
		}
		++mNumFrames;

		mLatencySum += nowUs - info.mTimeUs;
		++mLatencyCount;

		status_t err =
		mDecoderContext[0]->renderOutputBufferAndRelease(info.mIndex);
		CHECK_EQ(err, (status_t)OK);

media/libstagefright/wifi-display/sink/DirectRenderer.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ struct DirectRenderer : public AHandler {
		void setFormat(size_t trackIndex, const sp<AMessage> &format);
		void queueAccessUnit(size_t trackIndex, const sp<ABuffer> &accessUnit);

		int64_t getAvgLatenessUs();

		protected:
		virtual void onMessageReceived(const sp<AMessage> &msg);
		virtual ~DirectRenderer();
		@@ -64,9 +62,6 @@ private:

		sp<AudioRenderer> mAudioRenderer;

		int64_t mLatencySum;
		size_t mLatencyCount;

		int32_t mNumFramesLate;
		int32_t mNumFrames;

media/libstagefright/wifi-display/sink/WifiDisplaySink.cpp

+52 −26

Original line number	Diff line number	Diff line
		@@ -51,8 +51,10 @@ WifiDisplaySink::WifiDisplaySink(
		mIDRFrameRequestPending(false),
		mTimeOffsetUs(0ll),
		mTimeOffsetValid(false),
		mTargetLatencyUs(-1ll),
		mSetupDeferred(false) {
		mSetupDeferred(false),
		mLatencyCount(0),
		mLatencySumUs(0ll),
		mLatencyMaxUs(0ll) {
		// We support any and all resolutions, but prefer 720p30
		mSinkSupportedVideoFormats.setNativeResolution(
		VideoFormats::RESOLUTION_CEA, 5); // 1280 x 720 p30
		@@ -265,13 +267,20 @@ void WifiDisplaySink::onMessageReceived(const sp<AMessage> &msg) {

		case kWhatReportLateness:
		{
		int64_t latenessUs = mRenderer->getAvgLatenessUs();
		if (mLatencyCount > 0) {
		int64_t avgLatencyUs = mLatencySumUs / mLatencyCount;

		ALOGI("avg. lateness = %lld ms",
		(latenessUs + mTargetLatencyUs) / 1000ll);
		ALOGI("avg. latency = %lld ms (max %lld ms)",
		avgLatencyUs / 1000ll,
		mLatencyMaxUs / 1000ll);

		mMediaReceiver->notifyLateness(
		0 /* trackIndex */, latenessUs);
		0 /* trackIndex */, avgLatencyUs);
		}

		mLatencyCount = 0;
		mLatencySumUs = 0ll;
		mLatencyMaxUs = 0ll;

		msg->post(kReportLatenessEveryUs);
		break;
		@@ -282,6 +291,30 @@ void WifiDisplaySink::onMessageReceived(const sp<AMessage> &msg) {
		}
		}

		static void dumpDelay(size_t trackIndex, int64_t timeUs) {
		int64_t delayMs = (ALooper::GetNowUs() - timeUs) / 1000ll;

		static const int64_t kMinDelayMs = 0;
		static const int64_t kMaxDelayMs = 300;

		const char *kPattern = "########################################";
		size_t kPatternSize = strlen(kPattern);

		int n = (kPatternSize * (delayMs - kMinDelayMs))
		/ (kMaxDelayMs - kMinDelayMs);

		if (n < 0) {
		n = 0;
		} else if ((size_t)n > kPatternSize) {
		n = kPatternSize;
		}

		ALOGI("[%lld]: (%4lld ms) %s",
		timeUs / 1000,
		delayMs,
		kPattern + kPatternSize - n);
		}

		void WifiDisplaySink::onMediaReceiverNotify(const sp<AMessage> &msg) {
		int32_t what;
		CHECK(msg->findInt32("what", &what));
		@@ -319,24 +352,6 @@ void WifiDisplaySink::onMediaReceiverNotify(const sp<AMessage> &msg) {

		CHECK(mTimeOffsetValid);

		int64_t latencyUs = 200000ll; // 200ms by default

		char val[PROPERTY_VALUE_MAX];
		if (property_get("media.wfd-sink.latency", val, NULL)) {
		char *end;
		int64_t x = strtoll(val, &end, 10);

		if (end > val && *end == '\0' && x >= 0ll) {
		latencyUs = x;
		}
		}

		if (latencyUs != mTargetLatencyUs) {
		mTargetLatencyUs = latencyUs;

		ALOGI("Assuming %lld ms of latency.", latencyUs / 1000ll);
		}

		sp<ABuffer> accessUnit;
		CHECK(msg->findBuffer("accessUnit", &accessUnit));

		@@ -345,13 +360,24 @@ void WifiDisplaySink::onMediaReceiverNotify(const sp<AMessage> &msg) {

		// We are the timesync _client_,
		// client time = server time - time offset.
		timeUs += mTargetLatencyUs - mTimeOffsetUs;
		timeUs -= mTimeOffsetUs;

		accessUnit->meta()->setInt64("timeUs", timeUs);

		size_t trackIndex;
		CHECK(msg->findSize("trackIndex", &trackIndex));

		int64_t nowUs = ALooper::GetNowUs();
		int64_t delayUs = nowUs - timeUs;

		mLatencySumUs += delayUs;
		if (mLatencyCount == 0 \|\| delayUs > mLatencyMaxUs) {
		mLatencyMaxUs = delayUs;
		}
		++mLatencyCount;

		// dumpDelay(trackIndex, timeUs);

		#if USE_TUNNEL_RENDERER
		mRenderer->queueBuffer(accessUnit);
		#else

media/libstagefright/wifi-display/sink/WifiDisplaySink.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -132,10 +132,12 @@ private:
		int64_t mTimeOffsetUs;
		bool mTimeOffsetValid;

		int64_t mTargetLatencyUs;

		bool mSetupDeferred;

		size_t mLatencyCount;
		int64_t mLatencySumUs;
		int64_t mLatencyMaxUs;

		status_t sendM2(int32_t sessionID);
		status_t sendSetup(int32_t sessionID, const char *uri);
		status_t sendPlay(int32_t sessionID, const char *uri);