Speech recognition audio_type support

Author: yatsinar

camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java

@@ -22,6 +22,9 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import static com.flurgle.camerakit.CameraKit.Constants.AUDIO_DEFAULT;
+import static com.flurgle.camerakit.CameraKit.Constants.AUDIO_MUTED;
+import static com.flurgle.camerakit.CameraKit.Constants.AUDIO_VOICE_RECOGNITION_COMPATIBLE;
 import static com.flurgle.camerakit.CameraKit.Constants.FLASH_OFF;
 import static com.flurgle.camerakit.CameraKit.Constants.FOCUS_CONTINUOUS;
 import static com.flurgle.camerakit.CameraKit.Constants.FOCUS_OFF;
@@ -70,6 +73,9 @@ public class Camera1 extends CameraImpl {
     @VideoQuality
     private int mVideoQuality;
 
+    @Audio
+    private int mAudio;
+
     private Handler mHandler = new Handler();
 
     Camera1(CameraListener callback, PreviewImpl preview) {
@@ -211,6 +217,11 @@ void setVideoQuality(int videoQuality) {
         this.mVideoQuality = videoQuality;
     }
 
+    @Override
+    void setAudio(@Audio final int audio) {
+        this.mAudio = audio;
+    }
+
     @Override
     void captureImage() {
         switch (mMethod) {
@@ -477,7 +488,16 @@ private void initMediaRecorder() {
         mMediaRecorder.setCamera(mCamera);
 
         mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
-        mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
+
+        switch (mAudio) {
+            case AUDIO_DEFAULT:
+                mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
+            case AUDIO_VOICE_RECOGNITION_COMPATIBLE:
+                mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.VOICE_RECOGNITION);
+            case AUDIO_MUTED:
+                //For muted audio setAudioSource isn't called
+                break;
+        }
 
         mMediaRecorder.setProfile(getCamcorderProfile(mVideoQuality));
 

camerakit/src/main/api21/com/flurgle/camerakit/Camera2.java

@@ -160,6 +160,11 @@ void setVideoQuality(int videoQuality) {
 
     }
 
+    @Override
+    void setAudio(@Audio final int audio) {
+        //TODO
+    }
+
     @Override
     void captureImage() {
 

camerakit/src/main/base/com/flurgle/camerakit/CameraImpl.java

@@ -23,6 +23,7 @@ abstract class CameraImpl {
     abstract void setMethod(@Method int method);
     abstract void setZoom(@Zoom int zoom);
     abstract void setVideoQuality(@VideoQuality int videoQuality);
+    abstract void setAudio(@Audio int audio);
 
     abstract void captureImage();
     abstract void startVideo();

camerakit/src/main/java/com/flurgle/camerakit/CameraKit.java

@@ -47,6 +47,10 @@ public static class Constants {
         public static final int VIDEO_QUALITY_LOWEST = 5;
         public static final int VIDEO_QUALITY_QVGA = 6;
 
+        public static final int AUDIO_DEFAULT = 0;
+        public static final int AUDIO_VOICE_RECOGNITION_COMPATIBLE = 1;
+        public static final int AUDIO_MUTED = 2;
+
     }
 
     static class Defaults {
@@ -58,6 +62,7 @@ static class Defaults {
         static final int DEFAULT_METHOD = Constants.METHOD_STANDARD;
         static final int DEFAULT_PERMISSIONS = Constants.PERMISSIONS_STRICT;
         static final int DEFAULT_VIDEO_QUALITY = Constants.VIDEO_QUALITY_480P;
+        static final int DEFAULT_AUDIO = Constants.AUDIO_DEFAULT;
 
         static final int DEFAULT_JPEG_QUALITY = 100;
         static final boolean DEFAULT_CROP_OUTPUT = false;

camerakit/src/main/java/com/flurgle/camerakit/CameraView.java

@@ -89,6 +89,10 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
 
     @VideoQuality
     private int mVideoQuality;
+
+    @Audio
+    private int mAudio;
+
     private int mJpegQuality;
     private boolean mCropOutput;
 
@@ -130,6 +134,7 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
                 mZoom = a.getInteger(R.styleable.CameraView_ckZoom, CameraKit.Defaults.DEFAULT_ZOOM);
                 mPermissions = a.getInteger(R.styleable.CameraView_ckPermissions, CameraKit.Defaults.DEFAULT_PERMISSIONS);
                 mVideoQuality = a.getInteger(R.styleable.CameraView_ckVideoQuality, CameraKit.Defaults.DEFAULT_VIDEO_QUALITY);
+                mAudio = a.getInteger(R.styleable.CameraView_ckAudio, CameraKit.Defaults.DEFAULT_AUDIO);
                 mJpegQuality = a.getInteger(R.styleable.CameraView_ckJpegQuality, CameraKit.Defaults.DEFAULT_JPEG_QUALITY);
                 mCropOutput = a.getBoolean(R.styleable.CameraView_ckCropOutput, CameraKit.Defaults.DEFAULT_CROP_OUTPUT);
                 mAdjustViewBounds = a.getBoolean(R.styleable.CameraView_android_adjustViewBounds, CameraKit.Defaults.DEFAULT_ADJUST_VIEW_BOUNDS);
@@ -151,6 +156,7 @@ private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
         setZoom(mZoom);
         setPermissions(mPermissions);
         setVideoQuality(mVideoQuality);
+        setAudio(mAudio);
 
         if (!isInEditMode()) {
             mDisplayOrientationDetector = new DisplayOrientationDetector(context) {
@@ -372,6 +378,11 @@ public void setVideoQuality(@VideoQuality int videoQuality) {
         mCameraImpl.setVideoQuality(mVideoQuality);
     }
 
+    public void setAudio(@Audio int audio) {
+        this.mAudio = audio;
+        mCameraImpl.setAudio(mAudio);
+    }
+
     public void setJpegQuality(int jpegQuality) {
         this.mJpegQuality = jpegQuality;
     }

camerakit/src/main/res/values/attrs.xml

@@ -56,6 +56,12 @@
             <enum name="qvga" value="6" />
         </attr>
 
+        <attr name="ckAudio" format="enum">
+            <enum name="default_source" value="0" />
+            <enum name="speech_recognition" value="1" />
+            <enum name="muted" value="2" />
+        </attr>
+
         <attr name="ckCropOutput" format="boolean" />
 
         <attr name="android:adjustViewBounds" />

camerakit/src/main/types/com/flurgle/camerakit/Audio.java

@@ -0,0 +1,19 @@
+package com.flurgle.camerakit;
+import android.support.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import static com.flurgle.camerakit.CameraKit.Constants.AUDIO_DEFAULT;
+import static com.flurgle.camerakit.CameraKit.Constants.AUDIO_MUTED;
+import static com.flurgle.camerakit.CameraKit.Constants.AUDIO_VOICE_RECOGNITION_COMPATIBLE;
+
+
+/**
+ * Created by yatsinar on 23/06/2017.
+ */
+@IntDef({AUDIO_DEFAULT, AUDIO_VOICE_RECOGNITION_COMPATIBLE, AUDIO_MUTED})
+@Retention(RetentionPolicy.SOURCE)
+public @interface Audio {
+
+}