Fixes for Camera1 and Camera2 shutter sound.

Shutter sound should now be consistent with the `playSoundOnCapture` prop. Additionally, it should happen on successful capture as opposed to camera capture start (consistent with iOS and any camera app)

Lastly, added missing props to the docs.

Author: cristianocca

android/src/main/java/com/google/android/cameraview/Camera1.java

@@ -123,6 +123,8 @@ class Camera1 extends CameraViewImpl implements MediaRecorder.OnInfoListener,
 
     private boolean mIsScanning;
 
+    private Boolean mPlaySoundOnCapture = false;
+
     private boolean mustUpdateSurface;
     private boolean surfaceWasDestroyed;
 
@@ -1048,6 +1050,8 @@ void adjustCameraParameters() {
         setZoomInternal(mZoom);
         setWhiteBalanceInternal(mWhiteBalance);
         setScanningInternal(mIsScanning);
+        setPlaySoundInternal(mPlaySoundOnCapture);
+
         try{
             mCamera.setParameters(mCameraParameters);
         }
@@ -1426,6 +1430,31 @@ private void setScanningInternal(boolean isScanning) {
         }
     }
 
+    private void setPlaySoundInternal(boolean playSoundOnCapture){
+        mPlaySoundOnCapture = playSoundOnCapture;
+        if(mCamera != null){
+            try{
+                mCamera.enableShutterSound(mPlaySoundOnCapture);
+            }
+            catch(Exception ex){
+                Log.e("CAMERA_1::", "setPlaySoundInternal failed", ex);
+            }
+        }
+    }
+
+    @Override
+    void setPlaySoundOnCapture(boolean playSoundOnCapture) {
+        if (playSoundOnCapture == mPlaySoundOnCapture) {
+            return;
+        }
+        setPlaySoundInternal(playSoundOnCapture);
+    }
+
+    @Override
+    public boolean getPlaySoundOnCapture(){
+        return mPlaySoundOnCapture;
+    }
+
     @Override
     public void onPreviewFrame(byte[] data, Camera camera) {
         Camera.Size previewSize = mCameraParameters.getPreviewSize();

android/src/main/java/com/google/android/cameraview/Camera2.java

@@ -37,6 +37,7 @@
 import android.media.Image;
 import android.media.ImageReader;
 import android.media.MediaRecorder;
+import android.media.MediaActionSound;
 import androidx.annotation.NonNull;
 import android.util.Log;
 import android.util.SparseIntArray;
@@ -194,6 +195,10 @@ public void onImageAvailable(ImageReader reader) {
                     if (image.getFormat() == ImageFormat.JPEG) {
                         // @TODO: implement deviceOrientation
                         mCallback.onPictureTaken(data, 0);
+                        if (mPlaySoundOnCapture) {
+                            MediaActionSound sound = new MediaActionSound();
+                            sound.play(MediaActionSound.SHUTTER_CLICK);
+                        }
                     } else {
                         mCallback.onFramePreview(data, image.getWidth(), image.getHeight(), mDisplayOrientation);
                     }
@@ -262,6 +267,8 @@ public void onImageAvailable(ImageReader reader) {
 
     private boolean mIsScanning;
 
+    private Boolean mPlaySoundOnCapture = false;
+
     private Surface mPreviewSurface;
 
     private Rect mInitialCropRegion;
@@ -675,6 +682,16 @@ public int getWhiteBalance() {
         return mWhiteBalance;
     }
 
+    @Override
+    void setPlaySoundOnCapture(boolean playSoundOnCapture) {
+        mPlaySoundOnCapture = playSoundOnCapture;
+    }
+
+    @Override
+    public boolean getPlaySoundOnCapture(){
+        return mPlaySoundOnCapture;
+    }
+
     @Override
     void setScanning(boolean isScanning) {
         if (mIsScanning == isScanning) {
@@ -905,6 +922,7 @@ void startCaptureSession() {
             mCamera.createCaptureSession(Arrays.asList(surface, mStillImageReader.getSurface(),
                     mScanImageReader.getSurface()), mSessionCallback, null);
         } catch (CameraAccessException e) {
+            Log.e(TAG, "Failed to start capture session", e);
             mCallback.onMountError();
         }
     }

android/src/main/java/com/google/android/cameraview/CameraView.java

@@ -256,6 +256,7 @@ protected Parcelable onSaveInstanceState() {
         state.focusDepth = getFocusDepth();
         state.zoom = getZoom();
         state.whiteBalance = getWhiteBalance();
+        state.playSoundOnCapture = getPlaySoundOnCapture();
         state.scanning = getScanning();
         state.pictureSize = getPictureSize();
         return state;
@@ -278,6 +279,7 @@ protected void onRestoreInstanceState(Parcelable state) {
         setFocusDepth(ss.focusDepth);
         setZoom(ss.zoom);
         setWhiteBalance(ss.whiteBalance);
+        setPlaySoundOnCapture(ss.playSoundOnCapture);
         setScanning(ss.scanning);
         setPictureSize(ss.pictureSize);
     }
@@ -585,6 +587,14 @@ public int getWhiteBalance() {
       return mImpl.getWhiteBalance();
     }
 
+    public void setPlaySoundOnCapture(boolean playSoundOnCapture) {
+      mImpl.setPlaySoundOnCapture(playSoundOnCapture);
+    }
+
+    public boolean getPlaySoundOnCapture() {
+      return mImpl.getPlaySoundOnCapture();
+    }
+
     public void setScanning(boolean isScanning) { mImpl.setScanning(isScanning);}
 
     public boolean getScanning() { return mImpl.getScanning(); }
@@ -736,6 +746,8 @@ protected static class SavedState extends BaseSavedState {
 
         int whiteBalance;
 
+        boolean playSoundOnCapture;
+
         boolean scanning;
 
         Size pictureSize;
@@ -752,6 +764,7 @@ public SavedState(Parcel source, ClassLoader loader) {
             focusDepth = source.readFloat();
             zoom = source.readFloat();
             whiteBalance = source.readInt();
+            playSoundOnCapture = source.readByte() != 0;
             scanning = source.readByte() != 0;
             pictureSize = source.readParcelable(loader);
         }
@@ -772,6 +785,7 @@ public void writeToParcel(Parcel out, int flags) {
             out.writeFloat(focusDepth);
             out.writeFloat(zoom);
             out.writeInt(whiteBalance);
+            out.writeByte((byte) (playSoundOnCapture ? 1 : 0));
             out.writeByte((byte) (scanning ? 1 : 0));
             out.writeParcelable(pictureSize, flags);
         }

android/src/main/java/com/google/android/cameraview/CameraViewImpl.java

@@ -124,6 +124,10 @@ abstract boolean record(String path, int maxDuration, int maxFileSize,
 
     abstract int getWhiteBalance();
 
+    abstract void setPlaySoundOnCapture(boolean playSoundOnCapture);
+
+    abstract boolean getPlaySoundOnCapture();
+
     abstract void setScanning(boolean isScanning);
 
     abstract boolean getScanning();

android/src/main/java/org/reactnative/camera/CameraViewManager.java

@@ -129,6 +129,11 @@ public void setPictureSize(RNCameraView view, String size) {
     view.setPictureSize(size.equals("None") ? null : Size.parse(size));
   }
 
+  @ReactProp(name = "playSoundOnCapture")
+  public void setPlaySoundOnCapture(RNCameraView view, boolean playSoundOnCapture) {
+    view.setPlaySoundOnCapture(playSoundOnCapture);
+  }
+
   @ReactProp(name = "barCodeTypes")
   public void setBarCodeTypes(RNCameraView view, ReadableArray barCodeTypes) {
     if (barCodeTypes == null) {
@@ -151,11 +156,6 @@ public void setUseCamera2Api(RNCameraView view, boolean useCamera2Api) {
     view.setUsingCamera2Api(useCamera2Api);
   }
 
-  @ReactProp(name = "playSoundOnCapture")
-  public void setPlaySoundOnCapture(RNCameraView view, boolean playSoundOnCapture) {
-    view.setPlaySoundOnCapture(playSoundOnCapture);
-  }
-
   @ReactProp(name = "faceDetectorEnabled")
   public void setFaceDetecting(RNCameraView view, boolean faceDetectorEnabled) {
     view.setShouldDetectFaces(faceDetectorEnabled);

android/src/main/java/org/reactnative/camera/RNCameraView.java

@@ -5,7 +5,6 @@
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.media.CamcorderProfile;
-import android.media.MediaActionSound;
 import android.os.Build;
 import androidx.core.content.ContextCompat;
 import android.view.View;
@@ -36,7 +35,6 @@ public class RNCameraView extends CameraView implements LifecycleEventListener,
   private Map<Promise, File> mPictureTakenDirectories = new ConcurrentHashMap<>();
   private Promise mVideoRecordedPromise;
   private List<String> mBarCodeTypes = null;
-  private Boolean mPlaySoundOnCapture = false;
 
   private boolean mIsPaused = false;
   private boolean mIsNew = true;
@@ -245,21 +243,14 @@ public void setBarCodeTypes(List<String> barCodeTypes) {
     initBarcodeReader();
   }
 
-  public void setPlaySoundOnCapture(Boolean playSoundOnCapture) {
-    mPlaySoundOnCapture = playSoundOnCapture;
-  }
-
   public void takePicture(final ReadableMap options, final Promise promise, final File cacheDirectory) {
     mBgHandler.post(new Runnable() {
       @Override
       public void run() {
         mPictureTakenPromises.add(promise);
         mPictureTakenOptions.put(promise, options);
         mPictureTakenDirectories.put(promise, cacheDirectory);
-        if (mPlaySoundOnCapture) {
-          MediaActionSound sound = new MediaActionSound();
-          sound.play(MediaActionSound.SHUTTER_CLICK);
-        }
+
         try {
           RNCameraView.super.takePicture(options);
         } catch (Exception e) {

docs/RNCamera.md

@@ -286,6 +286,11 @@ The idea is that you select the appropriate white balance setting for the type o
 
 Use the `whiteBalance` property to specify which white balance setting the camera should use.
 
+### `exposure`
+Value: float from `0` to `1.0`, or `-1` (default) for auto.
+
+Sets the camera's exposure value.
+
 ### `zoom`
 
 Value: float from `0` to `1.0`
@@ -334,6 +339,9 @@ Note: Must also provide cameraViewDimensions prop for Android device
 
 An `{width:, height: }` object which defines the width and height of the cameraView. This prop is used to adjust the effect of Aspect Raio for rectOfInterest area on Android
 
+### `Android` `playSoundOnCapture`
+Boolean to turn on or off the camera's shutter sound (default false). Note that in some countries, the shutter sound cannot be turned off.
+
 
 ### `iOS` `videoStabilizationMode`