From 8a14cc6d9a485ecd2c34f61be37dc8b2b57c9d73 Mon Sep 17 00:00:00 2001
From: Iwan Timmer <irtimmer@gmail.com>
Date: Sun, 29 Mar 2015 23:13:40 +0200
Subject: [PATCH] Update Limelight common

---
 libs/common                                          |  2 +-
 .../limelight/binding/video/FakeVideoRenderer.java   |  2 +-
 .../limelight/binding/video/ImxDecoderRenderer.java  |  7 ++-----
 .../limelight/binding/video/OmxDecoderRenderer.java  | 12 ++++--------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/libs/common b/libs/common
index 7aa5182..d419745 160000
--- a/libs/common
+++ b/libs/common
@@ -1 +1 @@
-Subproject commit 7aa5182de5acc81b08973bddf4ce36ab6dace0a4
+Subproject commit d4197452ab16cbf15898f6fadcf56ee4bdbcd8cb
diff --git a/src/com/limelight/binding/video/FakeVideoRenderer.java b/src/com/limelight/binding/video/FakeVideoRenderer.java
index ced94bc..ab1bb87 100644
--- a/src/com/limelight/binding/video/FakeVideoRenderer.java
+++ b/src/com/limelight/binding/video/FakeVideoRenderer.java
@@ -51,7 +51,7 @@ public class FakeVideoRenderer extends VideoDecoderRenderer {
 	public void directSubmitDecodeUnit(DecodeUnit decodeUnit) {
 		if (out!=null) {
 			try {
-				for (ByteBufferDescriptor buf:decodeUnit.getBufferList())
+				for (ByteBufferDescriptor buf = decodeUnit.getBufferHead(); buf != null; buf = buf.nextDescriptor)
 					out.write(buf.data, buf.offset, buf.length);
 			} catch (IOException e) {
 				LimeLog.severe(e.getMessage());
diff --git a/src/com/limelight/binding/video/ImxDecoderRenderer.java b/src/com/limelight/binding/video/ImxDecoderRenderer.java
index 4418495..8c8d1c2 100644
--- a/src/com/limelight/binding/video/ImxDecoderRenderer.java
+++ b/src/com/limelight/binding/video/ImxDecoderRenderer.java
@@ -31,13 +31,10 @@ public class ImxDecoderRenderer extends VideoDecoderRenderer {
 
 	@Override
 	public void directSubmitDecodeUnit(DecodeUnit decodeUnit) {
-		List<ByteBufferDescriptor> units = decodeUnit.getBufferList();
-		
 		boolean ok = true;
-		for (int i=0;i<units.size();i++) {
-			ByteBufferDescriptor bbd = units.get(i);
+		for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead(); bbd != null; bbd = bbd.nextDescriptor) {
 			if (ok) {
-				int ret = ImxDecoder.decode(bbd.data, bbd.offset, bbd.length, i == (units.size()-1));
+				int ret = ImxDecoder.decode(bbd.data, bbd.offset, bbd.length, bbd.nextDescriptor == null);
 				if (ret != 0) {
 					LimeLog.severe("Error code during decode: " + ret);
 					ok = false;
diff --git a/src/com/limelight/binding/video/OmxDecoderRenderer.java b/src/com/limelight/binding/video/OmxDecoderRenderer.java
index 7d55622..fe5c23d 100644
--- a/src/com/limelight/binding/video/OmxDecoderRenderer.java
+++ b/src/com/limelight/binding/video/OmxDecoderRenderer.java
@@ -37,9 +37,7 @@ public class OmxDecoderRenderer extends VideoDecoderRenderer {
 
 	@Override
 	public void directSubmitDecodeUnit(DecodeUnit decodeUnit) {
-		List<ByteBufferDescriptor> units = decodeUnit.getBufferList();
-		
-		ByteBufferDescriptor header = units.get(0);
+		ByteBufferDescriptor header = decodeUnit.getBufferHead();
 		if (header.data[header.offset+4] == 0x67) {
 			ByteBuffer origSpsBuf = ByteBuffer.wrap(header.data);
 
@@ -73,13 +71,11 @@ public class OmxDecoderRenderer extends VideoDecoderRenderer {
 			if (ret != 0) {
 				LimeLog.severe("Error code during decode: " + ret);
 			}
-		}
-		else {
+		} else {
 			boolean ok = true;
-			for (int i=0;i<units.size();i++) {
-				ByteBufferDescriptor bbd = units.get(i);
+			for (ByteBufferDescriptor bbd = header; bbd != null; bbd = bbd.nextDescriptor) {
 				if (ok) {
-					int ret = OmxDecoder.decode(bbd.data, bbd.offset, bbd.length, i == (units.size()-1));
+					int ret = OmxDecoder.decode(bbd.data, bbd.offset, bbd.length, bbd.nextDescriptor == null);
 					if (ret != 0) {
 						LimeLog.severe("Error code during decode: " + ret);
 						ok = false;