commit abd09a98140420b6c861d30e30494cd769e745b7
author Glenn Kasten <gkasten@google.com> Fri May 29 23:47:19 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 29 23:47:20 2015 +0000
tree 11fca81721145b5c7551106be074635357552d6b
parent 5d748826b90e8e3cdb740a220433fa60c6c9f31c
parent ac28eca1df49f581d952ffbda5d3019f7e3b7be6

Merge "Whitespace" into mnc-dev

src/android/AudioPlayer_to_android.cpp

diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index e578128..e282761 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -966,22 +966,8 @@
                 return result;
             }
 
-            switch (df_pcm->samplesPerSec) {
-            case SL_SAMPLINGRATE_8:
-            case SL_SAMPLINGRATE_11_025:
-            case SL_SAMPLINGRATE_12:
-            case SL_SAMPLINGRATE_16:
-            case SL_SAMPLINGRATE_22_05:
-            case SL_SAMPLINGRATE_24:
-            case SL_SAMPLINGRATE_32:
-            case SL_SAMPLINGRATE_44_1:
-            case SL_SAMPLINGRATE_48:
-                break;
-            case SL_SAMPLINGRATE_64:
-            case SL_SAMPLINGRATE_88_2:
-            case SL_SAMPLINGRATE_96:
-            case SL_SAMPLINGRATE_192:
-            default:
+            if (df_pcm->samplesPerSec < SL_SAMPLINGRATE_8 ||
+                    df_pcm->samplesPerSec > SL_SAMPLINGRATE_192) {
                 SL_LOGE("Cannot create audio player: unsupported sample rate %u milliHz",
                     (unsigned) df_pcm->samplesPerSec);
                 return SL_RESULT_CONTENT_UNSUPPORTED;
@@ -1305,8 +1291,13 @@
         audioTrack_handleUnderrun_lockPlay(ap);
         break;
 
+    case android::AudioTrack::EVENT_NEW_IAUDIOTRACK:
+        // ignore for now
+        break;
+
     case android::AudioTrack::EVENT_BUFFER_END:
     case android::AudioTrack::EVENT_LOOP_END:
+    case android::AudioTrack::EVENT_STREAM_END:
         // These are unexpected so fall through
     default:
         // FIXME where does the notification of SL_PLAYEVENT_HEADMOVING fit?

src/android/AudioRecorder_to_android.cpp

diff --git a/src/android/AudioRecorder_to_android.cpp b/src/android/AudioRecorder_to_android.cpp
index f8c0040..d01256e 100644
--- a/src/android/AudioRecorder_to_android.cpp
+++ b/src/android/AudioRecorder_to_android.cpp
@@ -22,15 +22,6 @@
 
 #include <system/audio.h>
 
-// use this flag to dump all recorded audio into a file
-//#define MONITOR_RECORDING
-#ifdef MONITOR_RECORDING
-#define MONITOR_TARGET "/sdcard/monitor.raw"
-#include <stdio.h>
-static FILE* gMonitorFp = NULL;
-#endif
-
-
 #define KEY_RECORDING_SOURCE_PARAMSIZE  sizeof(SLuint32)
 #define KEY_RECORDING_PRESET_PARAMSIZE  sizeof(SLuint32)
 
@@ -245,9 +236,6 @@
                 // consume data
                 // FIXME can we avoid holding the lock during the copy?
                 memcpy (pDest, pBuff->i16, pBuff->size);
-#ifdef MONITOR_RECORDING
-                if (NULL != gMonitorFp) { fwrite(pBuff->i16, pBuff->size, 1, gMonitorFp); }
-#endif
             } else {
                 // finish pushing the buffer or push the buffer in one shot
                 pBuff->size = oldFront->mSize - ar->mBufferQueue.mSizeConsumed;
@@ -262,9 +250,6 @@
                 // consume data
                 // FIXME can we avoid holding the lock during the copy?
                 memcpy (pDest, pBuff->i16, pBuff->size);
-#ifdef MONITOR_RECORDING
-                if (NULL != gMonitorFp) { fwrite(pBuff->i16, pBuff->size, 1, gMonitorFp); }
-#endif
                 // data has been copied to the buffer, and the buffer queue state has been updated
                 // we will notify the client if applicable
                 callback = ar->mBufferQueue.mCallback;
@@ -296,6 +281,13 @@
         audioRecorder_handleNewPos_lockRecord(ar);
         break;
 
+    case android::AudioRecord::EVENT_NEW_IAUDIORECORD:
+        // ignore for now
+        break;
+
+    default:
+        SL_LOGE("Encountered unknown AudioRecord event %d for CAudioRecord %p", event, ar);
+        break;
     }
 
     ar->mCallbackProtector->exitCb();
@@ -434,12 +426,6 @@
         ar->mAudioRecord.clear();
     }
 
-#ifdef MONITOR_RECORDING
-    gMonitorFp = fopen(MONITOR_TARGET, "w");
-    if (NULL == gMonitorFp) { SL_LOGE("error opening %s", MONITOR_TARGET); }
-    else { SL_LOGE("recording to %s", MONITOR_TARGET); } // SL_LOGE so it's always displayed
-#endif
-
     return result;
 }
 
@@ -468,13 +454,6 @@
     // explicit destructor
     ar->mAudioRecord.~sp();
     ar->mCallbackProtector.~sp();
-
-#ifdef MONITOR_RECORDING
-    if (NULL != gMonitorFp) {
-        fclose(gMonitorFp);
-        gMonitorFp = NULL;
-    }
-#endif
 }