Use same method to play sounds for consistency and so it works across…

… multiple devices.
creativehothouse · Mar 14, 2020 · 0911852 · 0911852
1 parent 1f89548
commit 0911852
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/android/src/main/java/com/google/android/cameraview/Camera1.java b/android/src/main/java/com/google/android/cameraview/Camera1.java
@@ -22,6 +22,7 @@
 import android.hardware.Camera;
 import android.media.CamcorderProfile;
 import android.media.MediaRecorder;
+import android.media.MediaActionSound;
 import android.os.Build;
 import android.os.Handler;
 import androidx.collection.SparseArrayCompat;
@@ -82,6 +83,9 @@ class Camera1 extends CameraViewImpl implements MediaRecorder.OnInfoListener,
 
     Camera mCamera;
 
+    // do not instantiate this every time since it allocates unnecessary resources
+    MediaActionSound sound = new MediaActionSound();
+
     private Camera.Parameters mCameraParameters;
 
     private final Camera.CameraInfo mCameraInfo = new Camera.CameraInfo();
@@ -752,6 +756,10 @@ public void onPictureTaken(byte[] data, Camera camera) {
                         // this shouldn't be needed and messes up autoFocusPointOfInterest
                         // camera.cancelAutoFocus();
 
+                        if(mPlaySoundOnCapture){
+                            sound.play(MediaActionSound.SHUTTER_CLICK);
+                        }
+
                         if (options.hasKey("pauseAfterCapture") && !options.getBoolean("pauseAfterCapture")) {
                             camera.startPreview();
                             mIsPreviewActive = true;
@@ -1434,10 +1442,21 @@ private void setPlaySoundInternal(boolean playSoundOnCapture){
         mPlaySoundOnCapture = playSoundOnCapture;
         if(mCamera != null){
             try{
-                mCamera.enableShutterSound(mPlaySoundOnCapture);
+                // Always disable shutter sound, and play our own.
+                // This is because not all devices honor this value when set to true
+                boolean res = mCamera.enableShutterSound(false);
+
+                // if we fail to disable the shutter sound
+                // set mPlaySoundOnCapture to false since it means
+                // we cannot change it and the system will play it
+                // playing the sound ourselves also makes it consistent with Camera2
+                if(!res){
+                    mPlaySoundOnCapture = false;
+                }
             }
             catch(Exception ex){
                 Log.e("CAMERA_1::", "setPlaySoundInternal failed", ex);
+                mPlaySoundOnCapture = false;
             }
         }
     }

diff --git a/android/src/main/java/com/google/android/cameraview/Camera2.java b/android/src/main/java/com/google/android/cameraview/Camera2.java
@@ -213,6 +213,8 @@ public void onImageAvailable(ImageReader reader) {
 
     CameraDevice mCamera;
 
+    MediaActionSound sound = new MediaActionSound();
+
     CameraCaptureSession mCaptureSession;
 
     CaptureRequest.Builder mPreviewRequestBuilder;
@@ -1299,7 +1301,6 @@ public void onCaptureCompleted(@NonNull CameraCaptureSession session,
                                 unlockFocus();
                             }
                             if (mPlaySoundOnCapture) {
-                                MediaActionSound sound = new MediaActionSound();
                                 sound.play(MediaActionSound.SHUTTER_CLICK);
                             }
                         }