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

Commit faf354dc authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Use size_t for frame size 

except in the control block, where we don't have room.

In AudioFlinger::ThreadBase::TrackBase::getBuffer,
read the frame size from control block only once.

Change-Id: Id6c4bccd4ed3e07d91df6bbea43bae45524f9f4e
parent fcbbaf1d

include/media/AudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ public: 
            int         channelCount() const;

            int         channels() const;

            uint32_t    frameCount() const;

            int         frameSize() const;

            size_t      frameSize() const;

            int         inputSource() const;

include/media/AudioTrack.h

+6 −1
Original line number Diff line number Diff line
@@ -219,7 +219,12 @@ public: 
            audio_format_t format() const;

            int         channelCount() const;

            uint32_t    frameCount() const;

            int         frameSize() const;



    /* Return channelCount * (bit depth per channel / 8).

     * channelCount is determined from channelMask, and bit depth comes from format.

     */

            size_t      frameSize() const;



            sp<IMemory>& sharedBuffer();

include/private/media/AudioTrackShared.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct audio_track_cblk_t 
                // 8 bit PCM data: in this case,  mCblk->frameSize is based on a sample size of

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



                uint8_t     frameSize;

                uint8_t     frameSize;       // would normally be size_t, but 8 bits is plenty

                uint8_t     pad1;

                uint16_t    bufferTimeoutMs; // Maximum cumulated timeout before restarting audioflinger

media/libmedia/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ uint32_t AudioRecord::frameCount() const 
    return mFrameCount;

}



int AudioRecord::frameSize() const

size_t AudioRecord::frameSize() const

{

    if (audio_is_linear_pcm(mFormat)) {

        return channelCount()*audio_bytes_per_sample(mFormat);

media/libmedia/AudioTrack.cpp

+3 −3
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ uint32_t AudioTrack::frameCount() const 
    return mCblk->frameCount;

}



int AudioTrack::frameSize() const

size_t AudioTrack::frameSize() const

{

    if (audio_is_linear_pcm(mFormat)) {

        return channelCount()*audio_bytes_per_sample(mFormat);
@@ -979,7 +979,7 @@ ssize_t AudioTrack::write(const void* buffer, size_t userSize) 
    ssize_t written = 0;

    const int8_t *src = (const int8_t *)buffer;

    Buffer audioBuffer;

    size_t frameSz = (size_t)frameSize();

    size_t frameSz = frameSize();



    do {

        audioBuffer.frameCount = userSize/frameSz;
@@ -1137,7 +1137,7 @@ bool AudioTrack::processAudioBuffer(const sp<AudioTrackThread>& thread) 


        audioBuffer.size = writtenSize;

        // NOTE: mCblk->frameSize is not equal to AudioTrack::frameSize() for

        // 8 bit PCM data: in this case,  mCblk->frameSize is based on a sampel size of

        // 8 bit PCM data: in this case,  mCblk->frameSize is based on a sample size of

        // 16 bit.

        audioBuffer.frameCount = writtenSize/mCblk->frameSize;