From 65c1507355d093e98db3819e2c92f3a8ff21c6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iva=CC=81n=20A=CC=81lvarez=20Pereira?= Date: Tue, 8 Jan 2019 19:35:18 +0100 Subject: [PATCH] =?UTF-8?q?=C2=B7=20Enable=20video=20and=20audio=20configu?= =?UTF-8?q?ration=20properties=20on=20CameraView=20component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Audio bit rate - Audio sample rate - Audio channels - Video bit rate ยท Revert changes from commit #a5a72e10e427232a25ff49123a9189c51c72e742 --- .../src/main/java/com/otaliastudios/cameraview/Camera1.java | 3 ++- .../java/com/otaliastudios/cameraview/CameraController.java | 2 +- demo/src/main/res/layout/activity_camera.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java index e49d54c9..f39ad544 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/Camera1.java @@ -692,10 +692,11 @@ class Camera1 extends CameraController implements Camera.PreviewCallback, Camera mCamera.unlock(); mMediaRecorder.setCamera(mCamera); + mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); if (mAudio == Audio.ON) { // Must be called before setOutputFormat. - mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); + mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT); } CamcorderProfile profile = getCamcorderProfile(); mMediaRecorder.setOutputFormat(profile.fileFormat); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java index 5f57adcb..610a03b5 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java @@ -303,7 +303,7 @@ abstract class CameraController implements } final void setAudioSampleRate(int audioSampleRate) { - mAudioBitRate = audioSampleRate; + mAudioSampleRate = audioSampleRate; } final void setAudioChannels(int audioChannels){ diff --git a/demo/src/main/res/layout/activity_camera.xml b/demo/src/main/res/layout/activity_camera.xml index 24ce4924..c6b72ec5 100644 --- a/demo/src/main/res/layout/activity_camera.xml +++ b/demo/src/main/res/layout/activity_camera.xml @@ -29,7 +29,7 @@ app:cameraGrid="off" app:cameraJpegQuality="100" app:cameraPlaySounds="true" - app:cameraSessionType="picture" + app:cameraSessionType="video" app:cameraVideoBitRate="128000" />