OSDN Git Service

Remove valid_mask from audio.h
authorjiabin <jiabin@google.com>
Mon, 7 May 2018 17:55:12 +0000 (10:55 -0700)
committerjiabin <jiabin@google.com>
Tue, 8 May 2018 19:03:04 +0000 (12:03 -0700)
As valid mask only using in hal to indicate which fields of microphone
characteristics is available and it is not used in other case, we can
only keep it in hal layer instead of audio.h.

Bug: 79272216
Test: run cts
Change-Id: I2f41c382551eff105f321a7d3639ac5d5557305c

audio/include/system/audio.h

index b15284b..8e15410 100644 (file)
@@ -1073,17 +1073,6 @@ typedef enum {
     AUDIO_MICROPHONE_CHANNEL_MAPPING_CNT = 3,
 } audio_microphone_channel_mapping_t;
 
-typedef enum {
-    AUDIO_MICROPHONE_CHARACTERISTIC_NONE = 0u, // 0x0
-    AUDIO_MICROPHONE_CHARACTERISTIC_SENSITIVITY = 1u, // 0x1
-    AUDIO_MICROPHONE_CHARACTERISTIC_MAX_SPL = 2u, // 0x2
-    AUDIO_MICROPHONE_CHARACTERISTIC_MIN_SPL = 4u, // 0x4
-    AUDIO_MICROPHONE_CHARACTERISTIC_ORIENTATION = 8u, // 0x8
-    AUDIO_MICROPHONE_CHARACTERISTIC_GEOMETRIC_LOCATION = 16u, // 0x10
-    AUDIO_MICROPHONE_CHARACTERISTIC_ALL = 31u, /* ((((SENSITIVITY | MAX_SPL) | MIN_SPL)
-                                                  | ORIENTATION) | GEOMETRIC_LOCATION) */
-} audio_microphone_characteristic_fields_t;
-
 /* the maximum length for the microphone id */
 #define AUDIO_MICROPHONE_ID_MAX_LEN 32
 /* max number of frequency responses in a frequency response table */
@@ -1118,7 +1107,6 @@ struct audio_microphone_characteristic_t {
     float frequency_responses[2][AUDIO_MICROPHONE_MAX_FREQUENCY_RESPONSES];
     struct audio_microphone_coordinate geometric_location;
     struct audio_microphone_coordinate orientation;
-    audio_microphone_characteristic_fields_t valid_mask;
 };
 
 __END_DECLS