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

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

Merge "Change Format_Invalid from enum to global const"

parents 56305028 51d53cd9

include/media/nbaio/NBAIO.h

+2 −3
Original line number Diff line number Diff line
@@ -53,9 +53,8 @@ enum { 
// too large, then this decision should be re-visited.

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

typedef unsigned NBAIO_Format;

enum {

    Format_Invalid

};



extern const NBAIO_Format Format_Invalid;



// Return the frame size of an NBAIO_Format in bytes

size_t Format_frameSize(const NBAIO_Format& format);

media/libnbaio/NBAIO.cpp

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ size_t Format_frameBitShift(const NBAIO_Format& format) 
    return Format_channelCount(format);

}



const NBAIO_Format Format_Invalid = { 0 };



enum {

    Format_SR_8000,

    Format_SR_11025,