commit eb57617e55adf5eb5d554d1ad6a8d1c4b4e3740b
author Atneya Nair <atneya@google.com> Thu Apr 21 18:24:01 2022 -0400
committer Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Aug 18 13:58:42 2022 -0700
tree 03479a183c993c13b47b729487047df5bd30857f
parent 65c81dfba69c9eae6aa09a9c3139a6f0a676f79f

Remove legacy callback interfaces

Remove interfaces associated with the legacy callback interface.
Note, some dead code in AudioTrack cannot be removed due to dependence
of vendor code on link time (b/169889714).

Test: Compiles, modified tests pass
Bug: 199156212
Merged-In: I544613e61b6879c188ee6aafdc3bdbabac3cc064
Change-Id: I544613e61b6879c188ee6aafdc3bdbabac3cc064

media/libaudioclient/tests/audiotrack_tests.cpp

diff --git a/media/libaudioclient/tests/audiotrack_tests.cpp b/media/libaudioclient/tests/audiotrack_tests.cpp
index 770ee52..a49af96 100644
--- a/media/libaudioclient/tests/audiotrack_tests.cpp
+++ b/media/libaudioclient/tests/audiotrack_tests.cpp
@@ -23,9 +23,9 @@
 using namespace android;
 
 TEST(AudioTrackTest, TestPlayTrack) {
-    std::unique_ptr<AudioPlayback> ap(new AudioPlayback(
-            44100, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO, AUDIO_OUTPUT_FLAG_NONE,
-            AUDIO_SESSION_NONE, AudioTrack::TRANSFER_OBTAIN));
+    const auto ap = sp<AudioPlayback>::make(44100 /* sampleRate */, AUDIO_FORMAT_PCM_16_BIT,
+                                            AUDIO_CHANNEL_OUT_STEREO, AUDIO_OUTPUT_FLAG_NONE,
+                                            AUDIO_SESSION_NONE, AudioTrack::TRANSFER_OBTAIN);
     ASSERT_NE(nullptr, ap);
     ASSERT_EQ(OK, ap->loadResource("/data/local/tmp/bbb_2ch_24kHz_s16le.raw"))
             << "Unable to open Resource";
@@ -36,8 +36,8 @@
 }
 
 TEST(AudioTrackTest, TestSeek) {
-    std::unique_ptr<AudioPlayback> ap(
-            new AudioPlayback(44100, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO));
+    const auto ap = sp<AudioPlayback>::make(
+            44100 /* sampleRate */, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO);
     ASSERT_NE(nullptr, ap);
     ASSERT_EQ(OK, ap->loadResource("/data/local/tmp/bbb_2ch_24kHz_s16le.raw"))
             << "Unable to open Resource";
@@ -48,9 +48,9 @@
 }
 
 TEST(AudioTrackTest, TestAudioCbNotifier) {
-    std::unique_ptr<AudioPlayback> ap(new AudioPlayback(
-            0, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO, AUDIO_OUTPUT_FLAG_FAST,
-            AUDIO_SESSION_NONE, AudioTrack::TRANSFER_SHARED));
+    const auto ap = sp<AudioPlayback>::make(0 /* sampleRate */, AUDIO_FORMAT_PCM_16_BIT,
+                                            AUDIO_CHANNEL_OUT_STEREO, AUDIO_OUTPUT_FLAG_FAST,
+                                            AUDIO_SESSION_NONE, AudioTrack::TRANSFER_SHARED);
     ASSERT_NE(nullptr, ap);
     ASSERT_EQ(OK, ap->loadResource("/data/local/tmp/bbb_2ch_24kHz_s16le.raw"))
             << "Unable to open Resource";
@@ -92,10 +92,10 @@
     const audio_output_flags_t mFlags;
     const audio_session_t mSessionId;
 
-    std::unique_ptr<AudioPlayback> mAP;
+    sp<AudioPlayback> mAP;
 
     virtual void SetUp() override {
-        mAP = std::make_unique<AudioPlayback>(mSampleRate, mFormat, mChannelMask, mFlags,
+        mAP = sp<AudioPlayback>::make(mSampleRate, mFormat, mChannelMask, mFlags,
                                               mSessionId);
         ASSERT_NE(nullptr, mAP);
         ASSERT_EQ(OK, mAP->loadResource("/data/local/tmp/bbb_2ch_24kHz_s16le.raw"))