commit 7473345009b12576d8a768c93cc29a6b404eafd8
author Phil Burk <philburk@google.com> Tue Apr 18 19:50:28 2017 -0700
committer Phil Burk <philburk@google.com> Tue Apr 18 21:46:46 2017 -0700
tree 729d4c034763663d9ad2db5b8c93aa3b061a80f9
parent 6642d7853365173ccc2c78e647a89b868340e2b1

aaudio: remove AAUDIO_FORMAT_PCM_I8_24 and I32

They were not supported and we may not support them.

Bug: 30210002
Test: test_aaudio.cpp
Change-Id: Ib8a5d416b93df87e4b73e03789eacf0fd3f77f8e
Signed-off-by: Phil Burk <philburk@google.com>

media/libaaudio/include/aaudio/AAudio.h

diff --git a/media/libaaudio/include/aaudio/AAudio.h b/media/libaaudio/include/aaudio/AAudio.h
index d0c7c22..4a39f18 100644
--- a/media/libaaudio/include/aaudio/AAudio.h
+++ b/media/libaaudio/include/aaudio/AAudio.h
@@ -54,9 +54,7 @@
     AAUDIO_FORMAT_INVALID = -1,
     AAUDIO_FORMAT_UNSPECIFIED = 0,
     AAUDIO_FORMAT_PCM_I16,
-    AAUDIO_FORMAT_PCM_FLOAT,
-    AAUDIO_FORMAT_PCM_I8_24,
-    AAUDIO_FORMAT_PCM_I32
+    AAUDIO_FORMAT_PCM_FLOAT
 };
 typedef int32_t aaudio_format_t;
 

media/libaaudio/src/binding/AAudioStreamConfiguration.cpp

diff --git a/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp b/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
index 5adb477..c2bcd05 100644
--- a/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
+++ b/media/libaaudio/src/binding/AAudioStreamConfiguration.cpp
@@ -93,8 +93,6 @@
     switch (mAudioFormat) {
     case AAUDIO_FORMAT_PCM_I16:
     case AAUDIO_FORMAT_PCM_FLOAT:
-    case AAUDIO_FORMAT_PCM_I8_24:
-    case AAUDIO_FORMAT_PCM_I32:
         break;
     default:
         ALOGE("AAudioStreamConfiguration.validate() invalid audioFormat = %d", mAudioFormat);

media/libaaudio/src/utility/AAudioUtilities.cpp

diff --git a/media/libaaudio/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp
index 5637f0d..87b8b0d 100644
--- a/media/libaaudio/src/utility/AAudioUtilities.cpp
+++ b/media/libaaudio/src/utility/AAudioUtilities.cpp
@@ -33,10 +33,6 @@
         case AAUDIO_FORMAT_PCM_I16:
             size = sizeof(int16_t);
             break;
-        case AAUDIO_FORMAT_PCM_I32:
-        case AAUDIO_FORMAT_PCM_I8_24:
-            size = sizeof(int32_t);
-            break;
         case AAUDIO_FORMAT_PCM_FLOAT:
             size = sizeof(float);
             break;
@@ -135,12 +131,6 @@
     case AAUDIO_FORMAT_PCM_FLOAT:
         androidFormat = AUDIO_FORMAT_PCM_FLOAT;
         break;
-    case AAUDIO_FORMAT_PCM_I8_24:
-        androidFormat = AUDIO_FORMAT_PCM_8_24_BIT;
-        break;
-    case AAUDIO_FORMAT_PCM_I32:
-        androidFormat = AUDIO_FORMAT_PCM_32_BIT;
-        break;
     default:
         androidFormat = AUDIO_FORMAT_DEFAULT;
         ALOGE("AAudioConvert_aaudioToAndroidDataFormat 0x%08X unrecognized", aaudioFormat);
@@ -158,12 +148,6 @@
     case AUDIO_FORMAT_PCM_FLOAT:
         aaudioFormat = AAUDIO_FORMAT_PCM_FLOAT;
         break;
-    case AUDIO_FORMAT_PCM_32_BIT:
-        aaudioFormat = AAUDIO_FORMAT_PCM_I32;
-        break;
-    case AUDIO_FORMAT_PCM_8_24_BIT:
-        aaudioFormat = AAUDIO_FORMAT_PCM_I8_24;
-        break;
     default:
         aaudioFormat = AAUDIO_FORMAT_INVALID;
         ALOGE("AAudioConvert_androidToAAudioDataFormat 0x%08X unrecognized", androidFormat);