Revert "audio: Do not use StreamSwitcher for StreamRemoteSubmix"
This reverts commit e976625a49d97a77f1e11b4826406be8d575136b.
Revert augmented to address the deprecation of StreamSwitcher.
This is a temporary change until we figure out how to update
the remote submix while completely preserving its old behavior.
Reason: The CL seems to break screen mirroring on devices using
the AOSP remote submix. The change seems to have modified
the remote submix behavior.
Bug: 373283656
Bug: 372394141
Bug: 373706825
Test: N/A, confirmed by bisection
Change-Id: If9bca9201c45be391e10eb5699af7ef9e1a03da8
diff --git a/audio/aidl/default/r_submix/SubmixRoute.h b/audio/aidl/default/r_submix/SubmixRoute.h
index 0097f39..5425f12 100644
--- a/audio/aidl/default/r_submix/SubmixRoute.h
+++ b/audio/aidl/default/r_submix/SubmixRoute.h
@@ -25,12 +25,10 @@
#include <media/nbaio/MonoPipe.h>
#include <media/nbaio/MonoPipeReader.h>
-#include <Utils.h>
#include <aidl/android/media/audio/common/AudioChannelLayout.h>
#include <aidl/android/media/audio/common/AudioDeviceAddress.h>
#include <aidl/android/media/audio/common/AudioFormatDescription.h>
-using aidl::android::hardware::audio::common::getFrameSizeInBytes;
using aidl::android::media::audio::common::AudioChannelLayout;
using aidl::android::media::audio::common::AudioFormatDescription;
using aidl::android::media::audio::common::AudioFormatType;
@@ -58,8 +56,8 @@
AudioChannelLayout channelLayout =
AudioChannelLayout::make<AudioChannelLayout::Tag::layoutMask>(
AudioChannelLayout::LAYOUT_STEREO);
- size_t frameSize = getFrameSizeInBytes(format, channelLayout);
- size_t frameCount = 0;
+ size_t frameSize;
+ size_t frameCount;
};
class SubmixRoute {