Chromium Code Reviews| Index: webrtc/api/android/java/src/org/webrtc/VideoCapturer.java |
| diff --git a/webrtc/api/android/java/src/org/webrtc/VideoCapturer.java b/webrtc/api/android/java/src/org/webrtc/VideoCapturer.java |
| index 0a5e7d592a94b8ebe3cf13cb179076e0cf368530..376dafcccdcdab9b3faf7c6936aa53429e3c10ce 100644 |
| --- a/webrtc/api/android/java/src/org/webrtc/VideoCapturer.java |
| +++ b/webrtc/api/android/java/src/org/webrtc/VideoCapturer.java |
| @@ -24,14 +24,13 @@ public interface VideoCapturer { |
| void onCapturerStopped(); |
| // Delivers a captured frame. Called on a Java thread owned by VideoCapturer. |
| - void onByteBufferFrameCaptured(byte[] data, int width, int height, int rotation, |
| - long timeStamp); |
| + void onByteBufferFrameCaptured( |
| + byte[] data, int width, int height, int rotation, long timeStamp); |
| // 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, int rotation, |
| - long timestamp); |
| + void onTextureFrameCaptured(int width, int height, int oesTextureId, float[] transformMatrix, |
| + int rotation, long timestamp); |
| // Requests an output format from the video capturer. Captured frames |
| // by the camera will be scaled/or dropped by the video capturer. |
| @@ -60,18 +59,17 @@ public interface VideoCapturer { |
| } |
| @Override |
| - public void onByteBufferFrameCaptured(byte[] data, int width, int height, |
| - int rotation, long timeStamp) { |
| - nativeOnByteBufferFrameCaptured(nativeSource, data, data.length, width, height, rotation, |
| - timeStamp); |
| + public void onByteBufferFrameCaptured( |
| + byte[] data, int width, int height, int rotation, long timeStamp) { |
| + nativeOnByteBufferFrameCaptured( |
| + nativeSource, data, data.length, width, height, rotation, timeStamp); |
| } |
| @Override |
| - public void onTextureFrameCaptured( |
| - int width, int height, int oesTextureId, float[] transformMatrix, int rotation, |
| - long timestamp) { |
| - nativeOnTextureFrameCaptured(nativeSource, width, height, oesTextureId, transformMatrix, |
| - rotation, timestamp); |
| + public void onTextureFrameCaptured(int width, int height, int oesTextureId, |
| + float[] transformMatrix, int rotation, long timestamp) { |
| + nativeOnTextureFrameCaptured( |
| + nativeSource, width, height, oesTextureId, transformMatrix, rotation, timestamp); |
| } |
| @Override |
| @@ -79,15 +77,14 @@ public interface VideoCapturer { |
| nativeOnOutputFormatRequest(nativeSource, width, height, framerate); |
| } |
| - private native void nativeCapturerStarted(long nativeSource, |
| - boolean success); |
| + private native void nativeCapturerStarted(long nativeSource, boolean success); |
| private native void nativeCapturerStopped(long nativeSource); |
| - private native void nativeOnByteBufferFrameCaptured(long nativeSource, |
| - byte[] data, int length, int width, int height, int rotation, long timeStamp); |
| + private native void nativeOnByteBufferFrameCaptured(long nativeSource, byte[] data, int length, |
| + int width, int height, int rotation, long timeStamp); |
| private native void nativeOnTextureFrameCaptured(long nativeSource, int width, int height, |
| int oesTextureId, float[] transformMatrix, int rotation, long timestamp); |
| - private native void nativeOnOutputFormatRequest(long nativeSource, |
| - int width, int height, int framerate); |
| + private native void nativeOnOutputFormatRequest( |
| + long nativeSource, int width, int height, int framerate); |
| } |
| /** |
| @@ -115,8 +112,7 @@ public interface VideoCapturer { |
| /** |
| * Use VideoSource.adaptOutputFormat() instead. |
| */ |
| - @Deprecated |
| - void onOutputFormatRequest(int width, int height, int framerate); |
| + @Deprecated void onOutputFormatRequest(int width, int height, int framerate); |
|
magjed_webrtc
2016/09/28 13:45:04
This looks strange. I'm about to delete it anyway
|
| void changeCaptureFormat(int width, int height, int framerate); |