From 46d26dd29195450db15704e84d65740628a821fb Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Thu, 16 Jul 2015 10:48:15 -0700
Subject: MediaRecorder: enable audio for slow motion recording

bug:22460747

Change-Id: I23f773ecf7b86928a8eacd25a481636e645affbe
---
 media/libmediaplayerservice/StagefrightRecorder.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'media/libmediaplayerservice/StagefrightRecorder.h')

diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h
index 8af9278..da00bc7 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.h
+++ b/media/libmediaplayerservice/StagefrightRecorder.h
@@ -111,12 +111,11 @@ private:
     int32_t mStartTimeOffsetMs;
     int32_t mTotalBitRate;
 
-    bool mCaptureTimeLapse;
+    bool mCaptureFpsEnable;
     float mCaptureFps;
-    int64_t mTimeBetweenTimeLapseFrameCaptureUs;
+    int64_t mTimeBetweenCaptureUs;
     sp<CameraSourceTimeLapse> mCameraSourceTimeLapse;
 
-
     String8 mParams;
 
     bool mIsMetaDataStoredInVideoBuffers;
@@ -157,8 +156,8 @@ private:
     status_t setParamAudioNumberOfChannels(int32_t channles);
     status_t setParamAudioSamplingRate(int32_t sampleRate);
     status_t setParamAudioTimeScale(int32_t timeScale);
-    status_t setParamTimeLapseEnable(int32_t timeLapseEnable);
-    status_t setParamTimeLapseFps(float fps);
+    status_t setParamCaptureFpsEnable(int32_t timeLapseEnable);
+    status_t setParamCaptureFps(float fps);
     status_t setParamVideoEncodingBitRate(int32_t bitRate);
     status_t setParamVideoIFramesInterval(int32_t seconds);
     status_t setParamVideoEncoderProfile(int32_t profile);
-- 
cgit v1.1