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

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

Merge "Remove checks for specific sample rates and channel counts"

parents e1b004e1 d42bc56e

media/libnbaio/NBAIO.cpp

+0 −18
Original line number Diff line number Diff line
@@ -39,24 +39,6 @@ int Format_frameBitShift(const NBAIO_Format& format) 


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



enum {

    Format_SR_8000,

    Format_SR_11025,

    Format_SR_16000,

    Format_SR_22050,

    Format_SR_24000,

    Format_SR_32000,

    Format_SR_44100,

    Format_SR_48000,

    Format_SR_Mask = 7

};



enum {

    Format_C_1 = 0x08,

    Format_C_2 = 0x10,

    Format_C_Mask = 0x18

};



unsigned Format_sampleRate(const NBAIO_Format& format)

{

    if (!Format_isValid(format)) {