summaryrefslogtreecommitdiffstats
path: root/media/libnbaio/NBAIO.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-31 09:41:08 -0800
committerGlenn Kasten <gkasten@google.com>2014-02-03 17:10:57 -0800
commit6e0d67d7b496ce17c0970a4ffd3a6f808860949c (patch)
treee9d0c68908bcbbcb3eb5ef28b2b2c0db5488fa39 /media/libnbaio/NBAIO.cpp
parentcc1e0e807ee9a9f163a4685cbd6efd6ae55849cf (diff)
downloadframeworks_av-6e0d67d7b496ce17c0970a4ffd3a6f808860949c.zip
frameworks_av-6e0d67d7b496ce17c0970a4ffd3a6f808860949c.tar.gz
frameworks_av-6e0d67d7b496ce17c0970a4ffd3a6f808860949c.tar.bz2
Use Format_isValid() and Format_isEqual() instead of direct comparison
Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9
Diffstat (limited to 'media/libnbaio/NBAIO.cpp')
-rw-r--r--media/libnbaio/NBAIO.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp
index cc12671..18e0252 100644
--- a/media/libnbaio/NBAIO.cpp
+++ b/media/libnbaio/NBAIO.cpp
@@ -55,7 +55,7 @@ enum {
unsigned Format_sampleRate(const NBAIO_Format& format)
{
- if (format == Format_Invalid) {
+ if (!Format_isValid(format)) {
return 0;
}
switch (format & Format_SR_Mask) {
@@ -82,7 +82,7 @@ unsigned Format_sampleRate(const NBAIO_Format& format)
unsigned Format_channelCount(const NBAIO_Format& format)
{
- if (format == Format_Invalid) {
+ if (!Format_isValid(format)) {
return 0;
}
switch (format & Format_C_Mask) {
@@ -218,9 +218,9 @@ ssize_t NBAIO_Port::negotiate(const NBAIO_Format offers[], size_t numOffers,
{
ALOGV("negotiate offers=%p numOffers=%u countersOffers=%p numCounterOffers=%u",
offers, numOffers, counterOffers, numCounterOffers);
- if (mFormat != Format_Invalid) {
+ if (Format_isValid(mFormat)) {
for (size_t i = 0; i < numOffers; ++i) {
- if (offers[i] == mFormat) {
+ if (Format_isEqual(offers[i], mFormat)) {
mNegotiated = true;
return i;
}