commit 1234008771662d2b250d6d4972adb04de963fb0d
author Paul McLean <pmclean@google.com> Tue Mar 19 09:35:05 2019 -0600
committer Paul McLean <pmclean@google.com> Thu Mar 21 21:51:49 2019 -0600
tree d050c75b3935ed9d20676312df0e7cd1d94cd13c
parent 60c73a445b632cc2e233b1a275efeee7414a41a4

API changes in MicrophoneDirection

Bug: 128523813
Test: Build, Testbed app

Change-Id: I7b5ee8ba4eec1090866d8aef891a98d50cd09cc5

media/libaudiohal/impl/StreamHalHidl.cpp

diff --git a/media/libaudiohal/impl/StreamHalHidl.cpp b/media/libaudiohal/impl/StreamHalHidl.cpp
index e396cf3..6c8e6a4 100644
--- a/media/libaudiohal/impl/StreamHalHidl.cpp
+++ b/media/libaudiohal/impl/StreamHalHidl.cpp
@@ -855,25 +855,26 @@
 #endif
 
 #if MAJOR_VERSION < 5
-status_t StreamInHalHidl::setMicrophoneDirection(audio_microphone_direction_t direction __unused) {
+status_t StreamInHalHidl::setPreferredMicrophoneDirection(
+            audio_microphone_direction_t direction __unused) {
     if (mStream == 0) return NO_INIT;
     return INVALID_OPERATION;
 }
 
-status_t StreamInHalHidl::setMicrophoneFieldDimension(float zoom __unused) {
+status_t StreamInHalHidl::setPreferredMicrophoneFieldDimension(float zoom __unused) {
     if (mStream == 0) return NO_INIT;
     return INVALID_OPERATION;
 }
 #else
-status_t StreamInHalHidl::setMicrophoneDirection(audio_microphone_direction_t direction) {
+status_t StreamInHalHidl::setPreferredMicrophoneDirection(audio_microphone_direction_t direction) {
     if (!mStream) return NO_INIT;
-    return processReturn("setMicrophoneDirection",
-                mStream->setMicrophoneDirection(static_cast<MicrophoneDirection>(direction)));
+    return processReturn("setPreferredMicrophoneDirection",
+        mStream->setMicrophoneDirection(static_cast<MicrophoneDirection>(direction)));
 }
 
-status_t StreamInHalHidl::setMicrophoneFieldDimension(float zoom) {
+status_t StreamInHalHidl::setPreferredMicrophoneFieldDimension(float zoom) {
     if (!mStream) return NO_INIT;
-    return processReturn("setMicrophoneFieldDimension",
+    return processReturn("setPreferredMicrophoneFieldDimension",
                 mStream->setMicrophoneFieldDimension(zoom));
 }
 #endif

media/libaudiohal/impl/StreamHalHidl.h

diff --git a/media/libaudiohal/impl/StreamHalHidl.h b/media/libaudiohal/impl/StreamHalHidl.h
index 9ac1067..f587889 100644
--- a/media/libaudiohal/impl/StreamHalHidl.h
+++ b/media/libaudiohal/impl/StreamHalHidl.h
@@ -221,10 +221,11 @@
     virtual status_t getActiveMicrophones(std::vector<media::MicrophoneInfo> *microphones);
 
     // Set microphone direction (for processing)
-    virtual status_t setMicrophoneDirection(audio_microphone_direction_t direction) override;
+    virtual status_t setPreferredMicrophoneDirection(
+                            audio_microphone_direction_t direction) override;
 
     // Set microphone zoom (for processing)
-    virtual status_t setMicrophoneFieldDimension(float zoom) override;
+    virtual status_t setPreferredMicrophoneFieldDimension(float zoom) override;
 
     // Called when the metadata of the stream's sink has been changed.
     status_t updateSinkMetadata(const SinkMetadata& sinkMetadata) override;

media/libaudiohal/impl/StreamHalLocal.cpp

diff --git a/media/libaudiohal/impl/StreamHalLocal.cpp b/media/libaudiohal/impl/StreamHalLocal.cpp
index fcb809b..7d5ce05 100644
--- a/media/libaudiohal/impl/StreamHalLocal.cpp
+++ b/media/libaudiohal/impl/StreamHalLocal.cpp
@@ -369,20 +369,21 @@
 #endif
 
 #if MAJOR_VERSION < 5
-status_t StreamInHalLocal::setMicrophoneDirection(audio_microphone_direction_t direction __unused) {
+status_t StreamInHalLocal::setPreferredMicrophoneDirection(
+            audio_microphone_direction_t direction __unused) {
     return INVALID_OPERATION;
 }
 
-status_t StreamInHalLocal::setMicrophoneFieldDimension(float zoom __unused) {
+status_t StreamInHalLocal::setPreferredMicrophoneFieldDimension(float zoom __unused) {
     return INVALID_OPERATION;
 }
 #else
-status_t StreamInHalLocal::setMicrophoneDirection(audio_microphone_direction_t direction) {
+status_t StreamInHalLocal::setPreferredMicrophoneDirection(audio_microphone_direction_t direction) {
     if (mStream->set_microphone_direction == NULL) return INVALID_OPERATION;
     return mStream->set_microphone_direction(mStream, direction);
 }
 
-status_t StreamInHalLocal::setMicrophoneFieldDimension(float zoom) {
+status_t StreamInHalLocal::setPreferredMicrophoneFieldDimension(float zoom) {
     if (mStream->set_microphone_field_dimension == NULL) return INVALID_OPERATION;
     return mStream->set_microphone_field_dimension(mStream, zoom);
 
@@ -391,3 +392,5 @@
 
 } // namespace CPP_VERSION
 } // namespace android
+
+

media/libaudiohal/impl/StreamHalLocal.h

diff --git a/media/libaudiohal/impl/StreamHalLocal.h b/media/libaudiohal/impl/StreamHalLocal.h
index 3d6c50e..34f2bd8 100644
--- a/media/libaudiohal/impl/StreamHalLocal.h
+++ b/media/libaudiohal/impl/StreamHalLocal.h
@@ -205,10 +205,10 @@
     virtual status_t getActiveMicrophones(std::vector<media::MicrophoneInfo> *microphones);
 
     // Sets microphone direction (for processing)
-    virtual status_t setMicrophoneDirection(audio_microphone_direction_t direction);
+    virtual status_t setPreferredMicrophoneDirection(audio_microphone_direction_t direction);
 
     // Sets microphone zoom (for processing)
-    virtual status_t setMicrophoneFieldDimension(float zoom);
+    virtual status_t setPreferredMicrophoneFieldDimension(float zoom);
 
     // Called when the metadata of the stream's sink has been changed.
     status_t updateSinkMetadata(const SinkMetadata& sinkMetadata) override;