Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(994)

Unified Diff: webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java

Issue 2861893003: Add support for media recorders in Camera1Capturer. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
diff --git a/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java b/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
index f2a813f6b8ca06672af12ef589013ad4542b0c37..41352abf51b1f1801399ae270d6b3c7d77049b5c 100644
--- a/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
+++ b/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
@@ -28,11 +28,8 @@ public class Camera1Capturer extends CameraCapturer {
CameraSession.Events events, Context applicationContext,
SurfaceTextureHelper surfaceTextureHelper, MediaRecorder mediaRecorder, String cameraName,
int width, int height, int framerate) {
- if (mediaRecorder != null) {
- throw new RuntimeException("MediaRecoder is not supported for camera 1.");
- }
- Camera1Session.create(createSessionCallback, events, captureToTexture, applicationContext,
- surfaceTextureHelper, Camera1Enumerator.getCameraIndex(cameraName), width, height,
- framerate);
+ Camera1Session.create(createSessionCallback, events,
+ captureToTexture || (mediaRecorder != null), applicationContext, surfaceTextureHelper,
+ mediaRecorder, Camera1Enumerator.getCameraIndex(cameraName), width, height, framerate);
}
}
« no previous file with comments | « no previous file | webrtc/sdk/android/instrumentationtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698