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

Commit 6278fdb1 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Miscellaneous cleanup for NBAIO"

parents f1f5475f 55e599da

include/media/nbaio/NBAIO.h

+2 −1
Original line number Diff line number Diff line
@@ -54,11 +54,12 @@ enum { 
// too large, then this decision should be re-visited.

// Sample rate and channel count are explicit, PCM interleaved 16-bit is assumed.

struct NBAIO_Format {

// FIXME make this a class, and change Format_... global methods to class methods

//private:

    unsigned    mSampleRate;

    unsigned    mChannelCount;

    audio_format_t  mFormat;

    ssize_t     mFrameSize;

    size_t      mFrameSize;

};



extern const NBAIO_Format Format_Invalid;

media/libnbaio/NBAIO.cpp

+0 −10
Original line number Diff line number Diff line
@@ -27,16 +27,6 @@ size_t Format_frameSize(const NBAIO_Format& format) 
    return format.mFrameSize;

}



#if 0

int Format_frameBitShift(const NBAIO_Format& format)

{

    // FIXME The sample format is hard-coded to AUDIO_FORMAT_PCM_16_BIT

    // sizeof(short) == 2, so frame size == 1 << channels

    return Format_channelCount(format);

    // FIXME must return -1 for non-power of 2

}

#endif



const NBAIO_Format Format_Invalid = { 0, 0, AUDIO_FORMAT_INVALID, 0 };



unsigned Format_sampleRate(const NBAIO_Format& format)