From 1d27309e530e69c1bb034ac0510e1b7340b27032 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Tue, 1 Jul 2014 19:51:45 -0700
Subject: [PATCH] Revert "Disable latency tracking due to performance problems"

This reverts commit 3dd57e9f38eb4b0ac6320706f38bb08db2549be5.
---
 .../video/MediaCodecDecoderRenderer.java      | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index d95d1371..16bb6ebb 100644
--- a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -28,6 +28,10 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	private boolean needsSpsNumRefFixup;
 	private VideoDepacketizer depacketizer;
 	
+	private long totalTimeMs;
+	private long decoderTimeMs;
+	private int totalFrames;
+	
 	private final static byte[] BITSTREAM_RESTRICTIONS = new byte[] {(byte) 0xF1, (byte) 0x83, 0x2A, 0x00};
 	
 	public static final List<String> blacklistedDecoderPrefixes;
@@ -179,6 +183,13 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 				    if (outIndex >= 0) {
 					    int lastIndex = outIndex;
 					    
+					    // Add delta time to the totals (excluding probable outliers)
+					    long delta = System.currentTimeMillis()-info.presentationTimeUs;
+					    if (delta > 5 && delta < 300) {
+					    	decoderTimeMs += delta;
+						    totalTimeMs += delta;
+					    }
+					    
 					    // Get the last output buffer in the queue
 					    while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
 					    	videoDecoder.releaseOutputBuffer(lastIndex, false);
@@ -236,6 +247,13 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		if (inputIndex >= 0)
 		{
 			ByteBuffer buf = videoDecoderInputBuffers[inputIndex];
+
+			long currentTime = System.currentTimeMillis();
+			long delta = currentTime-decodeUnit.getReceiveTimestamp();
+			if (delta >= 0 && delta < 300) {
+			    totalTimeMs += currentTime-decodeUnit.getReceiveTimestamp();
+			    totalFrames++;
+			}
 			
 			// Clear old input data
 			buf.clear();
@@ -309,7 +327,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 					videoDecoder.queueInputBuffer(inputIndex,
 							0, spsLength,
-							0, codecFlags);
+							currentTime, codecFlags);
 					return true;
 				}
 			}
@@ -322,7 +340,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 			videoDecoder.queueInputBuffer(inputIndex,
 					0, decodeUnit.getDataLength(),
-					0, codecFlags);
+					currentTime, codecFlags);
 		}
 		
 		return true;
@@ -414,11 +432,11 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 	@Override
 	public int getAverageDecoderLatency() {
-		return 0;
+		return (int)(decoderTimeMs / totalFrames);
 	}
 
 	@Override
 	public int getAverageEndToEndLatency() {
-		return 0;
+		return (int)(totalTimeMs / totalFrames);
 	}
 }