Updating WebRTC lib 3

rostopira · rostopira · commit 36c9820dbb9f · 2018-11-26T11:03:37.000+03:00
Fixed i420 rendering
Still not handling rotation correctly
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java b/android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java
@@ -21,6 +21,7 @@
 import org.webrtc.VideoFrame;
 import org.webrtc.VideoFrameDrawer;
 import org.webrtc.VideoSink;
+import org.webrtc.YuvHelper;
 
 import java.nio.ByteBuffer;
 
@@ -121,7 +122,7 @@ public int[] uploadYuvData(int width, int height, int[] strides, ByteBuffer[] pl
       }
       // Allocate copy buffer if necessary.
       if (copyCapacityNeeded > 0
-          && (copyBuffer == null || copyBuffer.capacity() < copyCapacityNeeded)) {
+              && (copyBuffer == null || copyBuffer.capacity() < copyCapacityNeeded)) {
         copyBuffer = ByteBuffer.allocateDirect(copyCapacityNeeded);
       }
       // Make sure YUV textures are allocated.
@@ -141,11 +142,12 @@ public int[] uploadYuvData(int width, int height, int[] strides, ByteBuffer[] pl
           // Input is packed already.
           packedByteBuffer = planes[i];
         } else {
-          Log.e(TAG, "Unpacked YUV buffer found");
-          throw new RuntimeException();
+          YuvHelper.copyPlane(
+                  planes[i], strides[i], copyBuffer, planeWidths[i], planeWidths[i], planeHeights[i]);
+          packedByteBuffer = copyBuffer;
         }
         GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_LUMINANCE, planeWidths[i],
-            planeHeights[i], 0, GLES20.GL_LUMINANCE, GLES20.GL_UNSIGNED_BYTE, packedByteBuffer);
+                planeHeights[i], 0, GLES20.GL_LUMINANCE, GLES20.GL_UNSIGNED_BYTE, packedByteBuffer);
       }
       return yuvTextures;
     }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import org.webrtc.VideoFrame;`
`22`	`22`	`import org.webrtc.VideoFrameDrawer;`
`23`	`23`	`import org.webrtc.VideoSink;`
	`24`	`+import org.webrtc.YuvHelper;`
`24`	`25`
`25`	`26`	`import java.nio.ByteBuffer;`
`26`	`27`
`@@ -121,7 +122,7 @@ public int[] uploadYuvData(int width, int height, int[] strides, ByteBuffer[] pl`
`121`	`122`	`}`
`122`	`123`	`// Allocate copy buffer if necessary.`
`123`	`124`	`if (copyCapacityNeeded > 0`
`124`		`- && (copyBuffer == null \|\| copyBuffer.capacity() < copyCapacityNeeded)) {`
	`125`	`+ && (copyBuffer == null \|\| copyBuffer.capacity() < copyCapacityNeeded)) {`
`125`	`126`	`copyBuffer = ByteBuffer.allocateDirect(copyCapacityNeeded);`
`126`	`127`	`}`
`127`	`128`	`// Make sure YUV textures are allocated.`
`@@ -141,11 +142,12 @@ public int[] uploadYuvData(int width, int height, int[] strides, ByteBuffer[] pl`
`141`	`142`	`// Input is packed already.`
`142`	`143`	`packedByteBuffer = planes[i];`
`143`	`144`	`} else {`
`144`		`- Log.e(TAG, "Unpacked YUV buffer found");`
`145`		`- throw new RuntimeException();`
	`145`	`+ YuvHelper.copyPlane(`
	`146`	`+ planes[i], strides[i], copyBuffer, planeWidths[i], planeWidths[i], planeHeights[i]);`
	`147`	`+ packedByteBuffer = copyBuffer;`
`146`	`148`	`}`
`147`	`149`	`GLES20.glTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_LUMINANCE, planeWidths[i],`
`148`		`- planeHeights[i], 0, GLES20.GL_LUMINANCE, GLES20.GL_UNSIGNED_BYTE, packedByteBuffer);`
	`150`	`+ planeHeights[i], 0, GLES20.GL_LUMINANCE, GLES20.GL_UNSIGNED_BYTE, packedByteBuffer);`
`149`	`151`	`}`
`150`	`152`	`return yuvTextures;`
`151`	`153`	`}`