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

Commit eddf9ef9 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Added audio_bytes_per_sample() helper function"

parents 10774791 671a6369

media/libmedia/AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ status_t AudioRecord::getMinFrameCount( 
    size <<= 1;



    if (audio_is_linear_pcm(format)) {

        size /= channelCount * (format == AUDIO_FORMAT_PCM_16_BIT ? 2 : 1);

        size /= channelCount * audio_bytes_per_sample(format);

    }



    *frameCount = size;
@@ -258,7 +258,7 @@ uint32_t AudioRecord::frameCount() const 
int AudioRecord::frameSize() const

{

    if (audio_is_linear_pcm(mFormat)) {

        return channelCount()*((format() == AUDIO_FORMAT_PCM_8_BIT) ? sizeof(uint8_t) : sizeof(int16_t));

        return channelCount()*audio_bytes_per_sample(mFormat);

    } else {

        return sizeof(uint8_t);

    }

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ uint32_t AudioTrack::frameCount() const 
int AudioTrack::frameSize() const

{

    if (audio_is_linear_pcm(mFormat)) {

        return channelCount()*((format() == AUDIO_FORMAT_PCM_8_BIT) ? sizeof(uint8_t) : sizeof(int16_t));

        return channelCount()*audio_bytes_per_sample(mFormat);

    } else {

        return sizeof(uint8_t);

    }

services/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2936,7 +2936,7 @@ AudioFlinger::PlaybackThread::Track::Track( 
        mStreamType = streamType;

        // NOTE: audio_track_cblk_t::frameSize for 8 bit PCM data is based on a sample size of

        // 16 bit because data is converted to 16 bit before being stored in buffer by AudioTrack

        mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * sizeof(int16_t) : sizeof(int8_t);

        mCblk->frameSize = audio_is_linear_pcm(format) ? mChannelCount * audio_bytes_per_sample(format) : sizeof(uint8_t);

    }

}