diff options
| author | Camera Software Integration <camswint@localhost> | 2016-06-07 22:48:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-07 22:48:24 -0700 |
| commit | 2c23961728e0fdcadcf7caee0dc14fa4dd6d208f (patch) | |
| tree | 33ff95c542086860d9088e95da2dc76237df9eda /src/com/android/camera/VideoModule.java | |
| parent | d3ba6546ce4c488ac1715c79650cf685ce2cacc1 (diff) | |
| parent | 1bb8f05ca58e028519541cc857375171b1fbb55e (diff) | |
| download | android_packages_apps_Snap-2c23961728e0fdcadcf7caee0dc14fa4dd6d208f.tar.gz android_packages_apps_Snap-2c23961728e0fdcadcf7caee0dc14fa4dd6d208f.tar.bz2 android_packages_apps_Snap-2c23961728e0fdcadcf7caee0dc14fa4dd6d208f.zip | |
Merge "SnapdragonCamera: Set outputFormat type as 3gp for AMR audio" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index f8d79ed00..b6c001522 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1487,6 +1487,10 @@ public class VideoModule implements CameraModule, mProfile.audioCodec = mAudioEncoder; mProfile.duration = mMaxVideoDurationInMs; + if ((mProfile.audioCodec == MediaRecorder.AudioEncoder.AMR_NB) && + !mCaptureTimeLapse && !isHFR) { + mProfile.fileFormat = MediaRecorder.OutputFormat.THREE_GPP; + } // Set params individually for HFR case, as we do not want to encode audio if ((isHFR || isHSR) && captureRate > 0) { if (isHSR) { |