Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8402d78 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

Merge commit 'cd677a30' into gingerbread-plus-aosp

* commit 'cd677a30':
  Remove hard-coded number of audio channels in AudioSource
parents 9a1034aa cd677a30

media/libmediaplayerservice/StagefrightRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() { 
        new AudioSource(

                mAudioSource,

                mSampleRate,

                AudioSystem::CHANNEL_IN_MONO);

                mAudioChannels);



    status_t err = audioSource->initCheck();

media/libstagefright/AudioSource.cpp

+14 −4
Original line number Diff line number Diff line
@@ -33,15 +33,25 @@ namespace android { 


AudioSource::AudioSource(

        int inputSource, uint32_t sampleRate, uint32_t channels)

    : mRecord(new AudioRecord(

                inputSource, sampleRate, AudioSystem::PCM_16_BIT, channels)),

      mInitCheck(mRecord->initCheck()),

      mStarted(false),

    : mStarted(false),

      mCollectStats(false),

      mTotalReadTimeUs(0),

      mTotalReadBytes(0),

      mTotalReads(0),

      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() {