commit 277a37ea5c5a5636740131c71a38de7cddbf3544
author Eric Laurent <elaurent@google.com> Mon Jul 29 18:37:52 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 29 18:37:52 2024 +0000
tree 177309a20a91f18ced51ce7b8cca33705d5fcf11
parent 55b2a0fdcf59ad7ef9d5c39feafdcfdf49adc72d

Revert "AudioFlinger: Control volume using Port ID"

This reverts commit 55b2a0fdcf59ad7ef9d5c39feafdcfdf49adc72d.

Reason for revert: b/356164780

Change-Id: I8ffa2a3ef93f66379418344ee680b8c624843366

services/audioflinger/IAfTrack.h

diff --git a/services/audioflinger/IAfTrack.h b/services/audioflinger/IAfTrack.h
index d123052..a9c87ad 100644
--- a/services/audioflinger/IAfTrack.h
+++ b/services/audioflinger/IAfTrack.h
@@ -21,7 +21,6 @@
 #include <audio_utils/mutex.h>
 #include <audiomanager/IAudioManager.h>
 #include <binder/IMemory.h>
-#include <datapath/VolumePortInterface.h>
 #include <fastpath/FastMixerDumpState.h>
 #include <media/AudioSystem.h>
 #include <media/VolumeShaper.h>
@@ -255,7 +254,7 @@
 };
 
 // Common interface for Playback tracks.
-class IAfTrack : public virtual IAfTrackBase, public virtual VolumePortInterface {
+class IAfTrack : public virtual IAfTrackBase {
 public:
     // FillingStatus is used for suppressing volume ramp at begin of playing
     enum FillingStatus { FS_INVALID, FS_FILLING, FS_FILLED, FS_ACTIVE };
@@ -290,8 +289,7 @@
             size_t frameCountToBeReady = SIZE_MAX,
             float speed = 1.0f,
             bool isSpatialized = false,
-            bool isBitPerfect = false,
-            float volume = 0.0f);
+            bool isBitPerfect = false);
 
     virtual void pause() = 0;
     virtual void flush() = 0;
@@ -454,7 +452,7 @@
     virtual ExtendedTimestamp getClientProxyTimestamp() const = 0;
 };
 
-class IAfMmapTrack : public virtual IAfTrackBase, public virtual VolumePortInterface {
+class IAfMmapTrack : public virtual IAfTrackBase {
 public:
     static sp<IAfMmapTrack> create(IAfThreadBase* thread,
             const audio_attributes_t& attr,
@@ -465,8 +463,7 @@
             bool isOut,
             const android::content::AttributionSourceState& attributionSource,
             pid_t creatorPid,
-            audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE,
-            float volume = 0.0f);
+            audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE);
 
     // protected by MMapThread::mLock
     virtual void setSilenced_l(bool silenced) = 0;