Updating WebRTC lib #1

rostopira · rostopira · commit c0c664d72bd2 · 2018-11-24T21:41:19.000+03:00
It builds 🎉
Loopback sample working. Poorly
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java b/android/src/main/java/com/cloudwebrtc/webrtc/SurfaceTextureRenderer.java
@@ -292,6 +292,7 @@ public void release() {
     renderThread.quit();
     synchronized (frameLock) {
       if (pendingFrame != null) {
+        pendingFrame.release();
         pendingFrame = null;
       }
     }
@@ -350,7 +351,7 @@ public void onFrame(VideoFrame frame) {
           synchronized (statisticsLock) {
             ++framesDropped;
           }
-          frame.release();
+          pendingFrame.release();
         }
         pendingFrame = frame;
         renderThreadHandler.post(renderFrameRunnable);
@@ -468,6 +469,7 @@ private void renderFrameOnRenderThread() {
     }
 
     final long startTimeNs = System.nanoTime();
+    //FIXME
     final float[] texMatrix = {
         1.0f , 0.0f , 0.0f , 0.0f,
         0.0f, 1.0f, 0.0f , 0.0f ,
@@ -561,7 +563,7 @@ private void updateFrameDimensionsAndReportEvents(VideoFrame frame) {
     synchronized (layoutLock) {
       if (frameWidth != frame.getRotatedWidth() || frameHeight != frame.getRotatedHeight() || frameRotation != frame.getRotation()) {
         Logging.d(TAG, getResourceName() + "Reporting frame resolution changed to "
-            + frame.getRotatedWidth() + "x" + frame.getRotatedHeight() + " with rotation " + frameRotation);
+            + frame.getRotatedWidth() + "x" + frame.getRotatedHeight() + " with rotation " + frame.getRotation());
         if (rendererEvents != null) {
           rendererEvents.onFrameResolutionChanged(frame.getRotatedWidth(), frame.getRotatedHeight(), frame.getRotation());
         }

Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ public void release() {`
`292`	`292`	`renderThread.quit();`
`293`	`293`	`synchronized (frameLock) {`
`294`	`294`	`if (pendingFrame != null) {`
	`295`	`+ pendingFrame.release();`
`295`	`296`	`pendingFrame = null;`
`296`	`297`	`}`
`297`	`298`	`}`
`@@ -350,7 +351,7 @@ public void onFrame(VideoFrame frame) {`
`350`	`351`	`synchronized (statisticsLock) {`
`351`	`352`	`++framesDropped;`
`352`	`353`	`}`
`353`		`- frame.release();`
	`354`	`+ pendingFrame.release();`
`354`	`355`	`}`
`355`	`356`	`pendingFrame = frame;`
`356`	`357`	`renderThreadHandler.post(renderFrameRunnable);`
`@@ -468,6 +469,7 @@ private void renderFrameOnRenderThread() {`
`468`	`469`	`}`
`469`	`470`
`470`	`471`	`final long startTimeNs = System.nanoTime();`
	`472`	`+ //FIXME`
`471`	`473`	`final float[] texMatrix = {`
`472`	`474`	`1.0f , 0.0f , 0.0f , 0.0f,`
`473`	`475`	`0.0f, 1.0f, 0.0f , 0.0f ,`
`@@ -561,7 +563,7 @@ private void updateFrameDimensionsAndReportEvents(VideoFrame frame) {`
`561`	`563`	`synchronized (layoutLock) {`
`562`	`564`	`if (frameWidth != frame.getRotatedWidth() \|\| frameHeight != frame.getRotatedHeight() \|\| frameRotation != frame.getRotation()) {`
`563`	`565`	`Logging.d(TAG, getResourceName() + "Reporting frame resolution changed to "`
`564`		`- + frame.getRotatedWidth() + "x" + frame.getRotatedHeight() + " with rotation " + frameRotation);`
	`566`	`+ + frame.getRotatedWidth() + "x" + frame.getRotatedHeight() + " with rotation " + frame.getRotation());`
`565`	`567`	`if (rendererEvents != null) {`
`566`	`568`	`rendererEvents.onFrameResolutionChanged(frame.getRotatedWidth(), frame.getRotatedHeight(), frame.getRotation());`
`567`	`569`	`}`