commit 6e0d67d7b496ce17c0970a4ffd3a6f808860949c
author Glenn Kasten <gkasten@google.com> Fri Jan 31 09:41:08 2014 -0800
committer Glenn Kasten <gkasten@google.com> Mon Feb 03 17:10:57 2014 -0800
tree e9d0c68908bcbbcb3eb5ef28b2b2c0db5488fa39
parent cc1e0e807ee9a9f163a4685cbd6efd6ae55849cf

Use Format_isValid() and Format_isEqual() instead of direct comparison

Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9

media/libnbaio/NBAIO.cpp

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 @@
 
 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_channelCount(const NBAIO_Format& format)
 {
-    if (format == Format_Invalid) {
+    if (!Format_isValid(format)) {
         return 0;
     }
     switch (format & Format_C_Mask) {
@@ -218,9 +218,9 @@
 {
     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;
             }