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

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

Merge "Add format parameter to Format_from_SR_C"

parents e53c9b8d f95a3c41

include/media/nbaio/NBAIO.h

+4 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <utils/Errors.h>

#include <utils/RefBase.h>

#include <media/AudioTimestamp.h>

#include <system/audio.h>



namespace android {
@@ -67,8 +68,9 @@ size_t Format_frameSize(const NBAIO_Format& format); 
int Format_frameBitShift(const NBAIO_Format& format);



// Convert a sample rate in Hz and channel count to an NBAIO_Format

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

NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount);

// FIXME Remove the default value of AUDIO_FORMAT_PCM_16_BIT, and rename

NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount,

        audio_format_t format = AUDIO_FORMAT_PCM_16_BIT);



// Return the sample rate in Hz of an NBAIO_Format

unsigned Format_sampleRate(const NBAIO_Format& format);

media/libnbaio/NBAIO.cpp

+2 −1
Original line number Diff line number Diff line
@@ -98,7 +98,8 @@ unsigned Format_channelCount(const NBAIO_Format& format) 
    }

}



NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount)

NBAIO_Format Format_from_SR_C(unsigned sampleRate, unsigned channelCount,

        audio_format_t format_ __unused)

{

    unsigned format;

    switch (sampleRate) {