From 63feab4965d9fe7e909e29fab182dd4749144a3b Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Tue, 16 Jul 2019 11:52:18 -0300 Subject: [PATCH] Add mono and stereo in attrs --- .../cameraview/video/encoding/AudioMediaEncoder.java | 5 +++++ cameraview/src/main/res/values/attrs.xml | 2 ++ demo/src/main/res/layout/activity_camera.xml | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java index 79d60a20..4024c616 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java @@ -45,8 +45,12 @@ public class AudioMediaEncoder extends MediaEncoder { private final AudioTimestamp mTimestamp; private Config mConfig; + /** + * Audio configuration to be passed as input to the constructor. + */ public static class Config { + // Configurable options public int bitRate; public int channels = 1; @@ -71,6 +75,7 @@ public class AudioMediaEncoder extends MediaEncoder { return byteRatePerChannel * channels; // byte/sec } + @SuppressWarnings("unused") private int bitRate() { return byteRate() * 8; // bit/sec } diff --git a/cameraview/src/main/res/values/attrs.xml b/cameraview/src/main/res/values/attrs.xml index a6efb1ac..083105fa 100644 --- a/cameraview/src/main/res/values/attrs.xml +++ b/cameraview/src/main/res/values/attrs.xml @@ -102,6 +102,8 @@ + + diff --git a/demo/src/main/res/layout/activity_camera.xml b/demo/src/main/res/layout/activity_camera.xml index 7168f803..3e9f269d 100644 --- a/demo/src/main/res/layout/activity_camera.xml +++ b/demo/src/main/res/layout/activity_camera.xml @@ -17,12 +17,12 @@ android:layout_marginBottom="88dp" android:keepScreenOn="true" app:cameraExperimental="true" - app:cameraEngine="camera1" + app:cameraEngine="camera2" app:cameraPreview="glSurface" app:cameraPlaySounds="true" app:cameraGrid="off" app:cameraFlash="off" - app:cameraAudio="on" + app:cameraAudio="stereo" app:cameraGestureTap="autoFocus" app:cameraGestureLongTap="none" app:cameraGesturePinch="zoom"