SpdifStreamOut: override getAudioProperties()
This CL restores the behaviour of
PlaybackThread::readOutputParameters_l() that was introduced in
ca5e6143740299c877d69e97f7968cd04476d32c for the SpdifStreamOut path,
but that was changed in 560637e3abc7ff0c28c74f46c39210fa7ad3a354, specifically that format, sample rate and channel mask are assigned from the shim rather than the HAL directly.
Change-Id: Iaca53f823b862ead135dd4820e232098aed605c7
diff --git a/services/audioflinger/datapath/SpdifStreamOut.cpp b/services/audioflinger/datapath/SpdifStreamOut.cpp
index 43e9c0c..56be5be 100644
--- a/services/audioflinger/datapath/SpdifStreamOut.cpp
+++ b/services/audioflinger/datapath/SpdifStreamOut.cpp
@@ -48,9 +48,9 @@
{
struct audio_config customConfig = *config;
- mApplicationFormat = config->format;
- mApplicationSampleRate = config->sample_rate;
- mApplicationChannelMask = config->channel_mask;
+ mApplicationConfig.format = config->format;
+ mApplicationConfig.sample_rate = config->sample_rate;
+ mApplicationConfig.channel_mask = config->channel_mask;
// Some data bursts run at a higher sample rate.
// TODO Move this into the audio_utils as a static method.
diff --git a/services/audioflinger/datapath/SpdifStreamOut.h b/services/audioflinger/datapath/SpdifStreamOut.h
index c8dc89f..1dd2886 100644
--- a/services/audioflinger/datapath/SpdifStreamOut.h
+++ b/services/audioflinger/datapath/SpdifStreamOut.h
@@ -68,22 +68,29 @@
[[nodiscard]] size_t getFrameSize() const override { return sizeof(int8_t); }
/**
+ * @return audio_config_base_t from the perspective of the application and the AudioFlinger.
+ */
+ [[nodiscard]] audio_config_base_t getAudioProperties() const override {
+ return mApplicationConfig;
+ }
+
+ /**
* @return format from the perspective of the application and the AudioFlinger.
*/
- [[nodiscard]] virtual audio_format_t getFormat() const { return mApplicationFormat; }
+ [[nodiscard]] virtual audio_format_t getFormat() const { return mApplicationConfig.format; }
/**
* The HAL may be running at a higher sample rate if, for example, playing wrapped EAC3.
* @return sample rate from the perspective of the application and the AudioFlinger.
*/
- [[nodiscard]] virtual uint32_t getSampleRate() const { return mApplicationSampleRate; }
+ [[nodiscard]] virtual uint32_t getSampleRate() const { return mApplicationConfig.sample_rate; }
/**
* The HAL is in stereo mode when playing multi-channel compressed audio over HDMI.
* @return channel mask from the perspective of the application and the AudioFlinger.
*/
[[nodiscard]] virtual audio_channel_mask_t getChannelMask() const {
- return mApplicationChannelMask;
+ return mApplicationConfig.channel_mask;
}
status_t flush() override;
@@ -109,9 +116,7 @@
};
MySPDIFEncoder mSpdifEncoder;
- audio_format_t mApplicationFormat = AUDIO_FORMAT_DEFAULT;
- uint32_t mApplicationSampleRate = 0;
- audio_channel_mask_t mApplicationChannelMask = AUDIO_CHANNEL_NONE;
+ audio_config_base_t mApplicationConfig = AUDIO_CONFIG_BASE_INITIALIZER;
ssize_t writeDataBurst(const void* data, size_t bytes);
ssize_t writeInternal(const void* buffer, size_t bytes);