Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread

Browse Source 
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp

* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
  Remove hard-coded number of audio channels in AudioSource
This commit is contained in:
James Dong
2010-06-17 11:26:57 -07:00
committed by Android Git Automerger
parent 9a1034aa97 cd677a3085
commit d8402d7861
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@@ -440,7 +440,7 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() {
new AudioSource( new AudioSource(
mAudioSource, mAudioSource,
mSampleRate, mSampleRate,
AudioSystem::CHANNEL_IN_MONO); mAudioChannels);
status_t err = audioSource->initCheck(); status_t err = audioSource->initCheck();

18
media/libstagefright/AudioSource.cpp
View File

@@ -33,15 +33,25 @@ namespace android {
AudioSource::AudioSource( AudioSource::AudioSource(
int inputSource, uint32_t sampleRate, uint32_t channels) int inputSource, uint32_t sampleRate, uint32_t channels)
: mRecord(new AudioRecord( : mStarted(false),
inputSource, sampleRate, AudioSystem::PCM_16_BIT, channels)),
mInitCheck(mRecord->initCheck()),
mStarted(false),
mCollectStats(false), mCollectStats(false),
mTotalReadTimeUs(0), mTotalReadTimeUs(0),
mTotalReadBytes(0), mTotalReadBytes(0),
mTotalReads(0), mTotalReads(0),
mGroup(NULL) { mGroup(NULL) {
LOGV("sampleRate: %d, channels: %d", sampleRate, channels);
uint32_t flags = AudioRecord::RECORD_AGC_ENABLE |
AudioRecord::RECORD_NS_ENABLE |
AudioRecord::RECORD_IIR_ENABLE;
mRecord = new AudioRecord(
inputSource, sampleRate, AudioSystem::PCM_16_BIT,
channels > 1? AudioSystem::CHANNEL_IN_STEREO: AudioSystem::CHANNEL_IN_MONO,
4 * kMaxBufferSize / sizeof(int16_t), /* Enable ping-pong buffers */
flags);
mInitCheck = mRecord->initCheck();
} }
AudioSource::~AudioSource() { AudioSource::~AudioSource() {