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

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

Issue 2844233002: Revert of Support adding and removing MediaRecorder to camera 2 session. (Closed)
Patch Set: Created 3 years, 8 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/api/org/webrtc/Camera2Capturer.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..fba5711ef83df834414b43def631bed0bc03d67a 100644
--- a/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
+++ b/webrtc/sdk/android/api/org/webrtc/Camera1Capturer.java
@@ -10,8 +10,11 @@
package org.webrtc;
+import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
+
import android.content.Context;
-import android.media.MediaRecorder;
+
+import java.util.List;
public class Camera1Capturer extends CameraCapturer {
private final boolean captureToTexture;
@@ -26,11 +29,8 @@
@Override
protected void createCameraSession(CameraSession.CreateSessionCallback createSessionCallback,
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.");
- }
+ SurfaceTextureHelper surfaceTextureHelper, String cameraName, int width, int height,
+ int framerate) {
Camera1Session.create(createSessionCallback, events, captureToTexture, applicationContext,
surfaceTextureHelper, Camera1Enumerator.getCameraIndex(cameraName), width, height,
framerate);
« no previous file with comments | « no previous file | webrtc/sdk/android/api/org/webrtc/Camera2Capturer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698