admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VideoCapturerAndroid: Report onFirstFrameAvailable() for textures as well

Browse Source 
We currently only trigger onFirstFrameAvailable() for byte buffer frames.

R=perkj@webrtc.org

Review URL: https://codereview.webrtc.org/1701993002 .

Cr-Commit-Position: refs/heads/master@{#11670}
This commit is contained in:
Magnus Jedvert 2016-02-18 15:47:47 +01:00
parent 5199c74d25
commit f45381e1e5
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
View File

@ -152,6 +152,18 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
capturer, cameraEvents, getInstrumentation().getContext());
}
@MediumTest
public void testCameraEventsUsingTextures() throws InterruptedException {
EglBase eglBase = EglBase.create();
VideoCapturerAndroidTestFixtures.CameraEvents cameraEvents =
VideoCapturerAndroidTestFixtures.createCameraEvents();
VideoCapturerAndroid capturer =
VideoCapturerAndroid.create("", cameraEvents, eglBase.getEglBaseContext());
VideoCapturerAndroidTestFixtures.cameraEventsInvoked(
capturer, cameraEvents, getInstrumentation().getContext());
eglBase.release();
}
@MediumTest
// Test what happens when attempting to call e.g. switchCamera() after camera has been stopped.
public void testCameraCallsAfterStop() throws InterruptedException {

10
webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
View File

@ -678,9 +678,13 @@ public class VideoCapturerAndroid implements
return;
}
if (dropNextFrame) {
surfaceHelper.returnTextureFrame();
dropNextFrame = false;
return;
surfaceHelper.returnTextureFrame();
dropNextFrame = false;
return;
}
if (eventsHandler != null && !firstFrameReported) {
eventsHandler.onFirstFrameAvailable();
firstFrameReported = true;
}
int rotation = getFrameOrientation();