commit 624a7fcb377f2a40109c16de5109ae8ea1f67a69
author Glenn Kasten <gkasten@google.com> Thu Jun 21 16:24:00 2012 -0700
committer Glenn Kasten <gkasten@google.com> Mon Jun 25 10:03:30 2012 -0700
tree 9082c6373d7a8c904183ba745697938ca30fda68
parent 70be725da4d8aafb94d47c1962e897ecd5fdf823

Use audio_channel_mask_t in AudioRecord

Change-Id: I9e1b918b2635d961604a4a9d88eb1c7179a167a7

include/media/AudioRecord.h

diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h
index aea65aa..dd3e116 100644
--- a/include/media/AudioRecord.h
+++ b/include/media/AudioRecord.h
@@ -139,7 +139,7 @@
                         AudioRecord(audio_source_t inputSource,
                                     uint32_t sampleRate = 0,
                                     audio_format_t format = AUDIO_FORMAT_DEFAULT,
-                                    uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,
+                                    audio_channel_mask_t channelMask = AUDIO_CHANNEL_IN_MONO,
                                     int frameCount      = 0,
                                     callback_t cbf = NULL,
                                     void* user = NULL,
@@ -164,7 +164,7 @@
             status_t    set(audio_source_t inputSource = AUDIO_SOURCE_DEFAULT,
                             uint32_t sampleRate = 0,
                             audio_format_t format = AUDIO_FORMAT_DEFAULT,
-                            uint32_t channelMask = AUDIO_CHANNEL_IN_MONO,
+                            audio_channel_mask_t channelMask = AUDIO_CHANNEL_IN_MONO,
                             int frameCount      = 0,
                             callback_t cbf = NULL,
                             void* user = NULL,
@@ -337,7 +337,7 @@
             bool processAudioBuffer(const sp<ClientRecordThread>& thread);
             status_t openRecord_l(uint32_t sampleRate,
                                 audio_format_t format,
-                                uint32_t channelMask,
+                                audio_channel_mask_t channelMask,
                                 int frameCount,
                                 audio_io_handle_t input);
             audio_io_handle_t getInput_l();
@@ -369,7 +369,7 @@
     bool                    mMarkerReached;
     uint32_t                mNewPosition;
     uint32_t                mUpdatePeriod;
-    uint32_t                mChannelMask;
+    audio_channel_mask_t    mChannelMask;
     audio_io_handle_t       mInput;
     int                     mSessionId;
     int                     mPreviousPriority;          // before start()

media/libmedia/AudioRecord.cpp

diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 113e9e3..bb314ec 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -77,7 +77,7 @@
         audio_source_t inputSource,
         uint32_t sampleRate,
         audio_format_t format,
-        uint32_t channelMask,
+        audio_channel_mask_t channelMask,
         int frameCount,
         callback_t cbf,
         void* user,
@@ -111,7 +111,7 @@
         audio_source_t inputSource,
         uint32_t sampleRate,
         audio_format_t format,
-        uint32_t channelMask,
+        audio_channel_mask_t channelMask,
         int frameCount,
         callback_t cbf,
         void* user,
@@ -120,7 +120,7 @@
         int sessionId)
 {
 
-    ALOGV("set(): sampleRate %d, channelMask %d, frameCount %d",sampleRate, channelMask, frameCount);
+    ALOGV("set(): sampleRate %d, channelMask %#x, frameCount %d",sampleRate, channelMask, frameCount);
 
     AutoMutex lock(mLock);
 
@@ -444,7 +444,7 @@
 status_t AudioRecord::openRecord_l(
         uint32_t sampleRate,
         audio_format_t format,
-        uint32_t channelMask,
+        audio_channel_mask_t channelMask,
         int frameCount,
         audio_io_handle_t input)
 {