Update Limelight common

moonlight-stream · Mar 29, 2015 · 8a14cc6 · 8a14cc6
1 parent 223ba11
commit 8a14cc6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/libs/common b/libs/common
diff --git a/src/com/limelight/binding/video/FakeVideoRenderer.java b/src/com/limelight/binding/video/FakeVideoRenderer.java
@@ -51,7 +51,7 @@ public void release() {
 	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
@@ -31,13 +31,10 @@ public void stop() { }
 
 	@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
@@ -37,9 +37,7 @@ public void release() {
 
 	@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 void directSubmitDecodeUnit(DecodeUnit decodeUnit) {
 			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;