diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-12-10 11:51:31 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-12-10 11:51:31 -0800 |
| commit | 4370e3dd2ff3766eba012fe3b109b7ace4008a32 (patch) | |
| tree | 428e28a1f0080fbeb1594aff16b826cb55f20203 | |
| parent | 8f01f0805042e3e9f3a83205fa26c9513fa10a4a (diff) | |
| download | android_packages_apps_Gallery2-4370e3dd2ff3766eba012fe3b109b7ace4008a32.tar.gz android_packages_apps_Gallery2-4370e3dd2ff3766eba012fe3b109b7ace4008a32.tar.bz2 android_packages_apps_Gallery2-4370e3dd2ff3766eba012fe3b109b7ace4008a32.zip | |
Don't record audio for HFR or timelapse modes
* This just doesn't make sense and causes issues with the HAL.
Change-Id: I8c608e5c9428adb5a709373547166045770b1850
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
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); |