commit aaa182854d8445388fb8a4cf50ce15b813b25a9c
author Andy Hung <hunga@google.com> Fri Jun 23 19:27:19 2023 -0700
committer Andy Hung <hunga@google.com> Fri Oct 06 20:03:41 2023 -0700
tree c2bbf61646318805d469b7c747c341cd1f97780b
parent d65869ff64e4dd1fc046da4f3d6562f28d586a46

AudioFlinger: Extract inner TrackHandle and RecordHandle classes

Test: atest audiorecord_tests audiotrack_tests audiorouting_tests trackplayerbase_tests audiosystem_tests
Test: atest AudioTrackTest AudioRecordTest
Test: YouTube, Camera
Bug: 288339104
Bug: 288468076
Merged-In: Ifc76e2aa4b6df801595d3ecc6b173dbc81cb9e3f
Change-Id: Ifc76e2aa4b6df801595d3ecc6b173dbc81cb9e3f
(cherry picked from commit a5a7fc9604696f724ab0515f6937e691375b119a)

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 4ae070b..90f984e 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1108,7 +1108,6 @@
     CreateTrackOutput output;
 
     sp<PlaybackThread::Track> track;
-    sp<TrackHandle> trackHandle;
     sp<Client> client;
     status_t lStatus;
     audio_stream_type_t streamType;
@@ -1298,7 +1297,7 @@
         AudioSystem::moveEffectsToIo(effectIds, effectThreadId);
     }
 
-    output.audioTrack = new TrackHandle(track);
+    output.audioTrack = PlaybackThread::Track::createIAudioTrackAdapter(track);
     _output = VALUE_OR_FATAL(output.toAidl());
 
 Exit:
@@ -2393,7 +2392,6 @@
     CreateRecordOutput output;
 
     sp<RecordThread::RecordTrack> recordTrack;
-    sp<RecordHandle> recordHandle;
     sp<Client> client;
     status_t lStatus;
     audio_session_t sessionId = input.sessionId;
@@ -2551,7 +2549,7 @@
     output.buffers = recordTrack->getBuffers();
     output.portId = portId;
 
-    output.audioRecord = new RecordHandle(recordTrack);
+    output.audioRecord = RecordThread::RecordTrack::createIAudioRecordAdapter(recordTrack);
     _output = VALUE_OR_FATAL(output.toAidl());
 
 Exit: