zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move AndroidVideoTrackSourceObserver from API to src

Browse Source 
BUG=webrtc:7172

Review-Url: https://codereview.webrtc.org/2803593004
Cr-Commit-Position: refs/heads/master@{#17562}
This commit is contained in:
magjed
2017-04-06 04:31:26 -07:00
committed by Commit bot
parent 639d46a7ab
commit 177b17e050
5 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/sdk/android/api/org/webrtc/PeerConnectionFactory.java
View File

@ -127,7 +127,7 @@ public class PeerConnectionFactory {
long nativeAndroidVideoTrackSource =
nativeCreateVideoSource(nativeFactory, eglContext, capturer.isScreencast());
VideoCapturer.CapturerObserver capturerObserver =
new VideoCapturer.AndroidVideoTrackSourceObserver(nativeAndroidVideoTrackSource);
new AndroidVideoTrackSourceObserver(nativeAndroidVideoTrackSource);
nativeInitializeVideoCapturer(
nativeFactory, capturer, nativeAndroidVideoTrackSource, capturerObserver);
return new VideoSource(nativeAndroidVideoTrackSource);

42
webrtc/sdk/android/api/org/webrtc/VideoCapturer.java
View File

@ -33,48 +33,6 @@ public interface VideoCapturer {
int rotation, long timestamp);
}
// An implementation of CapturerObserver that forwards all calls from
// Java to the C layer.
static class AndroidVideoTrackSourceObserver implements CapturerObserver {
// Pointer to VideoTrackSourceProxy proxying AndroidVideoTrackSource.
private final long nativeSource;
public AndroidVideoTrackSourceObserver(long nativeSource) {
this.nativeSource = nativeSource;
}
@Override
public void onCapturerStarted(boolean success) {
nativeCapturerStarted(nativeSource, success);
}
@Override
public void onCapturerStopped() {
nativeCapturerStopped(nativeSource);
}
@Override
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);
}
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 nativeOnTextureFrameCaptured(long nativeSource, int width, int height,
int oesTextureId, float[] transformMatrix, int rotation, long timestamp);
}
/**
* This function is used to initialize the camera thread, the android application context, and the
* capture observer. It will be called only once and before any startCapture() request. The