diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-04 22:06:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-04 22:06:20 +0000 |
| commit | b28c68321689fc2bed5d5c5935d7cadac9ca0ff9 (patch) | |
| tree | 87274623591e5efbb2e88730380d2f5ed6635a45 | |
| parent | 56305028e6b6d099eb9a1ebfc3005993f42c897c (diff) | |
| parent | 51d53cd993043d9286e12cba884e6ee4d10b5fac (diff) | |
| download | frameworks_av-b28c68321689fc2bed5d5c5935d7cadac9ca0ff9.zip frameworks_av-b28c68321689fc2bed5d5c5935d7cadac9ca0ff9.tar.gz frameworks_av-b28c68321689fc2bed5d5c5935d7cadac9ca0ff9.tar.bz2 | |
Merge "Change Format_Invalid from enum to global const"
| -rw-r--r-- | include/media/nbaio/NBAIO.h | 5 | ||||
| -rw-r--r-- | media/libnbaio/NBAIO.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/media/nbaio/NBAIO.h b/include/media/nbaio/NBAIO.h index b809351..9c9721a 100644 --- a/include/media/nbaio/NBAIO.h +++ b/include/media/nbaio/NBAIO.h @@ -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); diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp index 290604e..8a8155d 100644 --- a/media/libnbaio/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -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, |