Conclude VideoFrame emit fieldtrial.

Concludes VideoFrame emit fieldtrial and start producing VideoFrames
by default. Deprecates old onByteBufferFrameCaptured and
onTextureFrameCaptured methods.

Bug: webrtc:8776
Change-Id: Icc224e9f8d89a30f04cf95dd46a498d69cffe9d0
Reviewed-on: https://webrtc-review.googlesource.com/43022
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21866}

examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java

@@ -95,9 +95,6 @@ public class PeerConnectionClient {
       "WebRTC-H264HighProfile/Enabled/";
   private static final String DISABLE_WEBRTC_AGC_FIELDTRIAL =
       "WebRTC-Audio-MinimizeResamplingOnMobile/Enabled/";
-  private static final String VIDEO_FRAME_EMIT_FIELDTRIAL =
-      PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL + "/" + PeerConnectionFactory.TRIAL_ENABLED
-      + "/";
   private static final String AUDIO_CODEC_PARAM_BITRATE = "maxaveragebitrate";
   private static final String AUDIO_ECHO_CANCELLATION_CONSTRAINT = "googEchoCancellation";
   private static final String AUDIO_AUTO_GAIN_CONTROL_CONSTRAINT = "googAutoGainControl";
@@ -395,7 +392,6 @@ public class PeerConnectionClient {
       fieldTrials += DISABLE_WEBRTC_AGC_FIELDTRIAL;
       Log.d(TAG, "Disable WebRTC AGC field trial.");
     }
-    fieldTrials += VIDEO_FRAME_EMIT_FIELDTRIAL;
 
     // Check preferred video codec.
     preferredVideoCodec = VIDEO_CODEC_VP8;

sdk/android/api/org/webrtc/PeerConnectionFactory.java

@@ -20,7 +20,7 @@ import java.util.List;
 @JNINamespace("webrtc::jni")
 public class PeerConnectionFactory {
   public static final String TRIAL_ENABLED = "Enabled";
-  public static final String VIDEO_FRAME_EMIT_TRIAL = "VideoFrameEmit";
+  @Deprecated public static final String VIDEO_FRAME_EMIT_TRIAL = "VideoFrameEmit";
 
   private static final String TAG = "PeerConnectionFactory";
   private static final String VIDEO_CAPTURER_THREAD_NAME = "VideoCapturerThread";

sdk/android/api/org/webrtc/ScreenCapturerAndroid.java

@@ -195,8 +195,11 @@ public class ScreenCapturerAndroid
   @Override
   public void onTextureFrameAvailable(int oesTextureId, float[] transformMatrix, long timestampNs) {
     numCapturedFrames++;
-    capturerObserver.onTextureFrameCaptured(
+    final VideoFrame.Buffer buffer = surfaceTextureHelper.createTextureBuffer(
-        width, height, oesTextureId, transformMatrix, 0 /* rotation */, timestampNs);
+        width, height, RendererCommon.convertMatrixToAndroidGraphicsMatrix(transformMatrix));
+    final VideoFrame frame = new VideoFrame(buffer, 0 /* rotation */, timestampNs);
+    capturerObserver.onFrameCaptured(frame);
+    frame.release();
   }
 
   @Override

sdk/android/api/org/webrtc/VideoCapturer.java

@@ -23,13 +23,19 @@ public interface VideoCapturer {
     void onCapturerStopped();
 
     // Delivers a captured frame. Called on a Java thread owned by VideoCapturer.
-    void onByteBufferFrameCaptured(
+    @Deprecated
-        byte[] data, int width, int height, int rotation, long timeStamp);
+    default void onByteBufferFrameCaptured(
+        byte[] data, int width, int height, int rotation, long timeStamp) {
+      throw new UnsupportedOperationException("Deprecated and not implemented.");
+    }
 
     // Delivers a captured frame in a texture with id |oesTextureId|. Called on a Java thread
     // owned by VideoCapturer.
-    void onTextureFrameCaptured(int width, int height, int oesTextureId, float[] transformMatrix,
+    @Deprecated
-        int rotation, long timestamp);
+    default void onTextureFrameCaptured(int width, int height, int oesTextureId,
+        float[] transformMatrix, int rotation, long timestamp) {
+      throw new UnsupportedOperationException("Deprecated and not implemented.");
+    }
 
     // Delivers a captured frame. Called on a Java thread owned by VideoCapturer.
     void onFrameCaptured(VideoFrame frame);

sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java

@@ -124,18 +124,6 @@ class CameraVideoCapturerTestFixtures {
       Logging.d(TAG, "onCapturerStopped");
     }
 
-    @Override
-    public void onByteBufferFrameCaptured(
-        byte[] frame, int width, int height, int rotation, long timeStamp) {
-      throw new RuntimeException("onByteBufferFrameCaptured called");
-    }
-
-    @Override
-    public void onTextureFrameCaptured(int width, int height, int oesTextureId,
-        float[] transformMatrix, int rotation, long timeStamp) {
-      throw new RuntimeException("onTextureFrameCaptured called");
-    }
-
     @Override
     public void onFrameCaptured(VideoFrame frame) {
       synchronized (frameLock) {
@@ -346,8 +334,6 @@ class CameraVideoCapturerTestFixtures {
   CameraVideoCapturerTestFixtures(TestObjectFactory testObjectFactory) {
     PeerConnectionFactory.initialize(
         PeerConnectionFactory.InitializationOptions.builder(testObjectFactory.getAppContext())
-            .setFieldTrials(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL + "/"
-                + PeerConnectionFactory.TRIAL_ENABLED + "/")
             .createInitializationOptions());
 
     this.peerConnectionFactory = new PeerConnectionFactory(null /* options */);

sdk/android/instrumentationtests/src/org/webrtc/FileVideoCapturerTest.java

@@ -39,20 +39,6 @@ public class FileVideoCapturerTest {
       // Empty on purpose.
     }
 
-    @Override
-    // TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
-    @SuppressWarnings("NoSynchronizedMethodCheck")
-    public synchronized void onByteBufferFrameCaptured(
-        byte[] data, int width, int height, int rotation, long timeStamp) {
-      // Empty on purpose.
-    }
-
-    @Override
-    public void onTextureFrameCaptured(int width, int height, int oesTextureId,
-        float[] transformMatrix, int rotation, long timestamp) {
-      // Empty on purpose.
-    }
-
     @Override
     // TODO(bugs.webrtc.org/8491): Remove NoSynchronizedMethodCheck suppression.
     @SuppressWarnings("NoSynchronizedMethodCheck")

sdk/android/src/java/org/webrtc/AndroidVideoTrackSourceObserver.java

@@ -31,6 +31,7 @@ class AndroidVideoTrackSourceObserver implements VideoCapturer.CapturerObserver
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void onByteBufferFrameCaptured(
       byte[] data, int width, int height, int rotation, long timeStamp) {
     nativeOnByteBufferFrameCaptured(
@@ -38,6 +39,7 @@ class AndroidVideoTrackSourceObserver implements VideoCapturer.CapturerObserver
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void onTextureFrameCaptured(int width, int height, int oesTextureId,
       float[] transformMatrix, int rotation, long timestamp) {
     nativeOnTextureFrameCaptured(

sdk/android/src/java/org/webrtc/Camera1Session.java

@@ -36,8 +36,6 @@ class Camera1Session implements CameraSession {
 
   private static enum SessionState { RUNNING, STOPPED }
 
-  private final boolean videoFrameEmitTrialEnabled;
-
   private final Handler cameraThreadHandler;
   private final Events events;
   private final boolean captureToTexture;
@@ -158,9 +156,6 @@ class Camera1Session implements CameraSession {
       android.hardware.Camera camera, android.hardware.Camera.CameraInfo info,
       CaptureFormat captureFormat, long constructionTimeNs) {
     Logging.d(TAG, "Create new camera1 session on camera " + cameraId);
-    videoFrameEmitTrialEnabled =
-        PeerConnectionFactory.fieldTrialsFindFullName(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL)
-            .equals(PeerConnectionFactory.TRIAL_ENABLED);
 
     this.cameraThreadHandler = new Handler();
     this.events = events;
@@ -277,17 +272,12 @@ class Camera1Session implements CameraSession {
           transformMatrix = RendererCommon.multiplyMatrices(
               transformMatrix, RendererCommon.horizontalFlipMatrix());
         }
-        if (videoFrameEmitTrialEnabled) {
+        final VideoFrame.Buffer buffer =
-          final VideoFrame.Buffer buffer =
+            surfaceTextureHelper.createTextureBuffer(captureFormat.width, captureFormat.height,
-              surfaceTextureHelper.createTextureBuffer(captureFormat.width, captureFormat.height,
+                RendererCommon.convertMatrixToAndroidGraphicsMatrix(transformMatrix));
-                  RendererCommon.convertMatrixToAndroidGraphicsMatrix(transformMatrix));
+        final VideoFrame frame = new VideoFrame(buffer, rotation, timestampNs);
-          final VideoFrame frame = new VideoFrame(buffer, rotation, timestampNs);
+        events.onFrameCaptured(Camera1Session.this, frame);
-          events.onFrameCaptured(Camera1Session.this, frame);
+        frame.release();
-          frame.release();
-        } else {
-          events.onTextureFrameCaptured(Camera1Session.this, captureFormat.width,
-              captureFormat.height, oesTextureId, transformMatrix, rotation, timestampNs);
-        }
       }
     });
   }
@@ -317,22 +307,15 @@ class Camera1Session implements CameraSession {
           firstFrameReported = true;
         }
 
-        if (videoFrameEmitTrialEnabled) {
+        VideoFrame.Buffer frameBuffer = new NV21Buffer(
-          VideoFrame.Buffer frameBuffer = new NV21Buffer(data, captureFormat.width,
+            data, captureFormat.width, captureFormat.height, () -> cameraThreadHandler.post(() -> {
-              captureFormat.height, () -> cameraThreadHandler.post(() -> {
+              if (state == SessionState.RUNNING) {
-                if (state == SessionState.RUNNING) {
+                camera.addCallbackBuffer(data);
-                  camera.addCallbackBuffer(data);
+              }
-                }
+            }));
-              }));
+        final VideoFrame frame = new VideoFrame(frameBuffer, getFrameOrientation(), captureTimeNs);
-          final VideoFrame frame =
+        events.onFrameCaptured(Camera1Session.this, frame);
-              new VideoFrame(frameBuffer, getFrameOrientation(), captureTimeNs);
+        frame.release();
-          events.onFrameCaptured(Camera1Session.this, frame);
-          frame.release();
-        } else {
-          events.onByteBufferFrameCaptured(Camera1Session.this, data, captureFormat.width,
-              captureFormat.height, getFrameOrientation(), captureTimeNs);
-          camera.addCallbackBuffer(data);
-        }
       }
     });
   }

sdk/android/src/java/org/webrtc/Camera2Session.java

@@ -45,8 +45,6 @@ class Camera2Session implements CameraSession {
 
   private static enum SessionState { RUNNING, STOPPED }
 
-  private final boolean videoFrameEmitTrialEnabled;
-
   private final Handler cameraThreadHandler;
   private final CreateSessionCallback callback;
   private final Events events;
@@ -228,17 +226,12 @@ class Camera2Session implements CameraSession {
               transformMatrix =
                   RendererCommon.rotateTextureMatrix(transformMatrix, -cameraOrientation);
 
-              if (videoFrameEmitTrialEnabled) {
+              VideoFrame.Buffer buffer = surfaceTextureHelper.createTextureBuffer(
-                VideoFrame.Buffer buffer = surfaceTextureHelper.createTextureBuffer(
+                  captureFormat.width, captureFormat.height,
-                    captureFormat.width, captureFormat.height,
+                  RendererCommon.convertMatrixToAndroidGraphicsMatrix(transformMatrix));
-                    RendererCommon.convertMatrixToAndroidGraphicsMatrix(transformMatrix));
+              final VideoFrame frame = new VideoFrame(buffer, rotation, timestampNs);
-                final VideoFrame frame = new VideoFrame(buffer, rotation, timestampNs);
+              events.onFrameCaptured(Camera2Session.this, frame);
-                events.onFrameCaptured(Camera2Session.this, frame);
+              frame.release();
-                frame.release();
-              } else {
-                events.onTextureFrameCaptured(Camera2Session.this, captureFormat.width,
-                    captureFormat.height, oesTextureId, transformMatrix, rotation, timestampNs);
-              }
             }
           });
       Logging.d(TAG, "Camera device successfully started.");
@@ -313,9 +306,6 @@ class Camera2Session implements CameraSession {
       CameraManager cameraManager, SurfaceTextureHelper surfaceTextureHelper,
       MediaRecorder mediaRecorder, String cameraId, int width, int height, int framerate) {
     Logging.d(TAG, "Create new camera2 session on camera " + cameraId);
-    videoFrameEmitTrialEnabled =
-        PeerConnectionFactory.fieldTrialsFindFullName(PeerConnectionFactory.VIDEO_FRAME_EMIT_TRIAL)
-            .equals(PeerConnectionFactory.TRIAL_ENABLED);
 
     constructionTimeNs = System.nanoTime();
 

sdk/android/src/java/org/webrtc/CameraCapturer.java

@@ -192,44 +192,6 @@ abstract class CameraCapturer implements CameraVideoCapturer {
         capturerObserver.onFrameCaptured(frame);
       }
     }
-
-    @Override
-    public void onByteBufferFrameCaptured(
-        CameraSession session, byte[] data, int width, int height, int rotation, long timestamp) {
-      checkIsOnCameraThread();
-      synchronized (stateLock) {
-        if (session != currentSession) {
-          Logging.w(TAG, "onByteBufferFrameCaptured from another session.");
-          return;
-        }
-        if (!firstFrameObserved) {
-          eventsHandler.onFirstFrameAvailable();
-          firstFrameObserved = true;
-        }
-        cameraStatistics.addFrame();
-        capturerObserver.onByteBufferFrameCaptured(data, width, height, rotation, timestamp);
-      }
-    }
-
-    @Override
-    public void onTextureFrameCaptured(CameraSession session, int width, int height,
-        int oesTextureId, float[] transformMatrix, int rotation, long timestamp) {
-      checkIsOnCameraThread();
-      synchronized (stateLock) {
-        if (session != currentSession) {
-          Logging.w(TAG, "onTextureFrameCaptured from another session.");
-          surfaceHelper.returnTextureFrame();
-          return;
-        }
-        if (!firstFrameObserved) {
-          eventsHandler.onFirstFrameAvailable();
-          firstFrameObserved = true;
-        }
-        cameraStatistics.addFrame();
-        capturerObserver.onTextureFrameCaptured(
-            width, height, oesTextureId, transformMatrix, rotation, timestamp);
-      }
-    }
   };
 
   private final Runnable openCameraTimeoutRunnable = new Runnable() {

sdk/android/src/java/org/webrtc/CameraSession.java

@@ -26,12 +26,6 @@ interface CameraSession {
     void onCameraDisconnected(CameraSession session);
     void onCameraClosed(CameraSession session);
     void onFrameCaptured(CameraSession session, VideoFrame frame);
-
-    // The old way of passing frames. Will be removed eventually.
-    void onByteBufferFrameCaptured(
-        CameraSession session, byte[] data, int width, int height, int rotation, long timestamp);
-    void onTextureFrameCaptured(CameraSession session, int width, int height, int oesTextureId,
-        float[] transformMatrix, int rotation, long timestamp);
   }
 
   /**