Camcorder: Set audio code in profile based on hfr and time lapse settings.

Set audio codec in media profile only when time lapse is not set and
hfr is set to Off mode.

(cherry picked from commit f0a631472983c59e0fe936bffacc2fde763517f6 )

Change-Id: Id4ce04793b0968a18ec9c3ee3c71f77c7d0a4d34
(cherry picked from commit 47eec26bb58c977dceb07497c590f7dabf0417e6)
(cherry picked from commit aa4e7a3a4da9e46aee154a4152f2b93be888a9da)
(cherry picked from commit b7667e7e853248f516bb2edbc01f8c5cb7e5a7ab)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index edfeadfd5..5e986653e 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1087,10 +1087,14 @@ public class VideoModule implements CameraModule,
         // Unlock the camera object before passing it to media recorder.
         mCameraDevice.unlock();
         mMediaRecorder.setCamera(mCameraDevice.getCamera());
-        if (!mCaptureTimeLapse) {
+        String hfr = mParameters.getVideoHighFrameRate();
+        if (!mCaptureTimeLapse && ((hfr == null) || ("off".equals(hfr)))) {
             mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
             mProfile.audioCodec = mAudioEncoder;
+        } else {
+            mProfile.audioCodec = -1; //not set
         }
+
         mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
 
         mProfile.videoCodec = mVideoEncoder;