diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 10:11:44 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-26 10:11:44 -0700 |
| commit | c5d0343b677d5ddc2d69fd15b81b084a40ab12ac (patch) | |
| tree | d2709457029d8b4cc581bba22aa13e4fa8fabd42 /media/libmedia/AudioRecord.cpp | |
| parent | 620ad3dcf1e966bbcca3d6280fdd16f09441a733 (diff) | |
| parent | de8268d6d1cd168510c490b17e93154d2eab767c (diff) | |
| download | frameworks_base-c5d0343b677d5ddc2d69fd15b81b084a40ab12ac.zip frameworks_base-c5d0343b677d5ddc2d69fd15b81b084a40ab12ac.tar.gz frameworks_base-c5d0343b677d5ddc2d69fd15b81b084a40ab12ac.tar.bz2 | |
am de8268d6: Merge change 2331 into donut
Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c'
* commit 'de8268d6d1cd168510c490b17e93154d2eab767c':
Fix issue 1846343 - part 1
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 793bbf4..cf0965e 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -50,7 +50,7 @@ AudioRecord::AudioRecord() } AudioRecord::AudioRecord( - int streamType, + int inputSource, uint32_t sampleRate, int format, int channelCount, @@ -61,7 +61,7 @@ AudioRecord::AudioRecord( int notificationFrames) : mStatus(NO_INIT) { - mStatus = set(streamType, sampleRate, format, channelCount, + mStatus = set(inputSource, sampleRate, format, channelCount, frameCount, flags, cbf, user, notificationFrames); } @@ -82,7 +82,7 @@ AudioRecord::~AudioRecord() } status_t AudioRecord::set( - int streamType, + int inputSource, uint32_t sampleRate, int format, int channelCount, @@ -104,8 +104,8 @@ status_t AudioRecord::set( return NO_INIT; } - if (streamType == DEFAULT_INPUT) { - streamType = MIC_INPUT; + if (inputSource == DEFAULT_INPUT) { + inputSource = MIC_INPUT; } if (sampleRate == 0) { @@ -157,7 +157,7 @@ status_t AudioRecord::set( // open record channel status_t status; - sp<IAudioRecord> record = audioFlinger->openRecord(getpid(), streamType, + sp<IAudioRecord> record = audioFlinger->openRecord(getpid(), inputSource, sampleRate, format, channelCount, frameCount, @@ -201,6 +201,7 @@ status_t AudioRecord::set( mMarkerReached = false; mNewPosition = 0; mUpdatePeriod = 0; + mInputSource = (uint8_t)inputSource; return NO_ERROR; } @@ -242,6 +243,11 @@ int AudioRecord::frameSize() const return channelCount()*((format() == AudioSystem::PCM_8_BIT) ? sizeof(uint8_t) : sizeof(int16_t)); } +int AudioRecord::inputSource() const +{ + return (int)mInputSource; +} + // ------------------------------------------------------------------------- status_t AudioRecord::start() |