commit a77d5552a239c1b05a440c301f672106c4efda9e
author Mikhail Naganov <mnaganov@google.com> Sun Dec 18 02:48:14 2022 +0000
committer Mikhail Naganov <mnaganov@google.com> Thu Dec 22 03:26:10 2022 +0000
tree 20d9d2055aa94fda03a89fd7b94a16de86899166
parent 701d49fa1f0bfcbaa5ffc7650378c1c67860dcab

Stabilize audio playback types used by the HAL

The following types used to be framework-only (belonging
to android.media package). Since they need to be used
by the HAL, move them to stable android.media.audio.common
types package:
  - AudioDualMonoMode
  - LatencyMode -> AudioLatencyMode
  - AudioPlaybackRate

Bug: 175167149
Bug: 205884982
Test: m
Change-Id: I6cbe34d3b343fbefb0ae56e00dbf8360184e7b72
Merged-In: I6cbe34d3b343fbefb0ae56e00dbf8360184e7b72

services/audioflinger/Tracks.cpp

diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp
index 2d5fd78..a3a5df4 100644
--- a/services/audioflinger/Tracks.cpp
+++ b/services/audioflinger/Tracks.cpp
@@ -439,7 +439,8 @@
     return Status::ok();
 }
 
-Status AudioFlinger::TrackHandle::getDualMonoMode(media::AudioDualMonoMode* _aidl_return)
+Status AudioFlinger::TrackHandle::getDualMonoMode(
+        media::audio::common::AudioDualMonoMode* _aidl_return)
 {
     audio_dual_mono_mode_t mode = AUDIO_DUAL_MONO_MODE_OFF;
     const status_t status = mTrack->getDualMonoMode(&mode)
@@ -452,7 +453,7 @@
 }
 
 Status AudioFlinger::TrackHandle::setDualMonoMode(
-        media::AudioDualMonoMode mode)
+        media::audio::common::AudioDualMonoMode mode)
 {
     const auto localMonoMode = VALUE_OR_RETURN_BINDER_STATUS(
             aidl2legacy_AudioDualMonoMode_audio_dual_mono_mode_t(mode));
@@ -476,7 +477,7 @@
 }
 
 Status AudioFlinger::TrackHandle::getPlaybackRateParameters(
-        media::AudioPlaybackRate* _aidl_return)
+        media::audio::common::AudioPlaybackRate* _aidl_return)
 {
     audio_playback_rate_t localPlaybackRate{};
     status_t status = mTrack->getPlaybackRateParameters(&localPlaybackRate)
@@ -489,7 +490,7 @@
 }
 
 Status AudioFlinger::TrackHandle::setPlaybackRateParameters(
-        const media::AudioPlaybackRate& playbackRate)
+        const media::audio::common::AudioPlaybackRate& playbackRate)
 {
     const audio_playback_rate_t localPlaybackRate = VALUE_OR_RETURN_BINDER_STATUS(
             aidl2legacy_AudioPlaybackRate_audio_playback_rate_t(playbackRate));