diff options
author | Chong Zhang <chz@google.com> | 2015-07-17 21:25:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-17 21:25:31 +0000 |
commit | dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7 (patch) | |
tree | 3b2293036ff4a6dfec5624a2907b4929659b26e0 /include | |
parent | 51d0b1d84dc1c095e68126257213f24f64ab3aa0 (diff) | |
parent | 46d26dd29195450db15704e84d65740628a821fb (diff) | |
download | frameworks_av-dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7.zip frameworks_av-dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7.tar.gz frameworks_av-dd761ecee86cc24ac8774bf1f004ea29b1e0d3f7.tar.bz2 |
Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/AudioSource.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index 50cf371..3074910 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -37,7 +37,8 @@ struct AudioSource : public MediaSource, public MediaBufferObserver { audio_source_t inputSource, const String16 &opPackageName, uint32_t sampleRate, - uint32_t channels = 1); + uint32_t channels, + uint32_t outSampleRate = 0); status_t initCheck() const; @@ -78,11 +79,13 @@ private: status_t mInitCheck; bool mStarted; int32_t mSampleRate; + int32_t mOutSampleRate; bool mTrackMaxAmplitude; int64_t mStartTimeUs; int16_t mMaxAmplitude; int64_t mPrevSampleTimeUs; + int64_t mFirstSampleTimeUs; int64_t mInitialReadTimeUs; int64_t mNumFramesReceived; int64_t mNumClientOwnedBuffers; |