diff options
| author | Andreas Huber <andih@google.com> | 2014-04-11 07:54:53 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 17:12:03 +0000 |
| commit | d411b4ca2945cd8974a3a78199fce94646950128 (patch) | |
| tree | e1c9e21525348fe826b91ecee7075ccb743f843d /media/libstagefright/AudioSource.cpp | |
| parent | 51b3ea2b8f7298bffbd246c65a606cd053357b66 (diff) | |
| download | frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.zip frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.tar.gz frameworks_av-d411b4ca2945cd8974a3a78199fce94646950128.tar.bz2 | |
warnings be gone.
(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)
Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts
or errors downstream to a minimum.
Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
Diffstat (limited to 'media/libstagefright/AudioSource.cpp')
| -rw-r--r-- | media/libstagefright/AudioSource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/AudioSource.cpp b/media/libstagefright/AudioSource.cpp index f0d1a14..e68a710 100644 --- a/media/libstagefright/AudioSource.cpp +++ b/media/libstagefright/AudioSource.cpp @@ -68,7 +68,7 @@ AudioSource::AudioSource( int frameCount = kMaxBufferSize / sizeof(int16_t) / channelCount; // make sure that the AudioRecord total buffer size is large enough - int bufCount = 2; + size_t bufCount = 2; while ((bufCount * frameCount) < minFrameCount) { bufCount++; } @@ -208,7 +208,7 @@ void AudioSource::rampVolume( } status_t AudioSource::read( - MediaBuffer **out, const ReadOptions *options) { + MediaBuffer **out, const ReadOptions * /* options */) { Mutex::Autolock autoLock(mLock); *out = NULL; |