Index: webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java |
diff --git a/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java b/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java |
index 859b7f745331841016ff78ba52b34a27b1d4af09..800363abda20c246422efef0ade9bba9f2fa107e 100644 |
--- a/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java |
+++ b/webrtc/sdk/android/src/java/org/webrtc/CameraCapturer.java |
@@ -177,31 +177,11 @@ abstract class CameraCapturer implements CameraVideoCapturer { |
} |
@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) { |
+ public void onFrameCaptured(CameraSession session, VideoFrame frame) { |
checkIsOnCameraThread(); |
synchronized (stateLock) { |
if (session != currentSession) { |
Logging.w(TAG, "onTextureFrameCaptured from another session."); |
- surfaceHelper.returnTextureFrame(); |
return; |
} |
if (!firstFrameObserved) { |
@@ -209,8 +189,7 @@ abstract class CameraCapturer implements CameraVideoCapturer { |
firstFrameObserved = true; |
} |
cameraStatistics.addFrame(); |
- capturerObserver.onTextureFrameCaptured( |
- width, height, oesTextureId, transformMatrix, rotation, timestamp); |
+ capturerObserver.onFrameCaptured(frame); |
} |
} |
}; |