From 4370e3dd2ff3766eba012fe3b109b7ace4008a32 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Tue, 10 Dec 2013 11:51:31 -0800 Subject: Don't record audio for HFR or timelapse modes * This just doesn't make sense and causes issues with the HAL. Change-Id: I8c608e5c9428adb5a709373547166045770b1850 --- src/com/android/camera/VideoModule.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index b3b31700e..9f360f0ba 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1384,8 +1384,11 @@ public class VideoModule implements CameraModule, mActivity.mCameraDevice.unlock(); mActivity.mCameraDevice.waitDone(); mMediaRecorder.setCamera(mActivity.mCameraDevice.getCamera()); - if (!mCaptureTimeLapse) { + String hfr = mParameters.getVideoHighFrameRate(); + if (!mCaptureTimeLapse && ((hfr == null) || ("off".equals(hfr)))) { mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER); + } else { + mProfile.audioCodec = -1; } mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); mMediaRecorder.setProfile(mProfile); -- cgit v1.2.3