feat(qconnect): real duration/queue_item_ids in join report + DeviceAudioQualityChanged(27)

Add the RndrSrvrDeviceAudioQualityChanged(27) renderer report end to end:
the report-type variant + message string in qconnect-protocol renderer.rs,
the RendererDeviceAudioQualityChangedMessage proto struct plus the genuinely
free tag-27 field on QConnectMessage (26=file AQ, 28=max AQ), and the mapper
arm. Wire the adapter emitter report_device_audio_quality_if_changed (deduped
via a new last_reported_device_audio_quality sync-state field) next to the
file-AQ report, sourcing the real output stream config. Fix the deferred-join
StateUpdated report to resolve the real current track duration (via CoreBridge)
and current/next queue_item_ids instead of hardcoding nulls.

cc
This commit is contained in:
vicrodh committed 2026-06-01 04:29:18 -06:00
1 parent 0d5eb50889
commit 03a551e6ff
6 files changed
+155 -4

No files matched your search

+38 -1
View File
@@ -15,7 +15,8 @@ use crate::{
DeviceInfoMessage, JoinSessionMessage, MuteVolumeMessage, PlaybackPositionMessage,
QConnectMessage, QConnectMessageType, QConnectMessages, QueueAddTracksMessage,
QueueInsertTracksMessage, QueueLoadTracksMessage, QueueRemoveTracksMessage,
QueueReorderTracksMessage, QueueVersionRef, RendererFileAudioQualityChangedMessage,
QueueReorderTracksMessage, QueueVersionRef, RendererDeviceAudioQualityChangedMessage,
RendererFileAudioQualityChangedMessage,
RendererMaxAudioQualityChangedMessage, RendererStateMessage, RendererStateUpdatedMessage,
RendererVolumeChangedMessage, RendererVolumeMutedMessage, SetActiveRendererMessage,
SetAutoplayModeMessage, SetLoopModeMessage, SetMaxAudioQualityMessage,
@@ -486,6 +487,19 @@ fn map_renderer_report(report: &RendererReport) -> Result<QConnectMessage, Proto
}),
..Default::default()
}),
RendererReportType::RndrSrvrDeviceAudioQualityChanged => Ok(QConnectMessage {
message_type: Some(
QConnectMessageType::MessageTypeRndrSrvrDeviceAudioQualityChanged as i32,
),
rndr_srvr_device_audio_quality_changed: Some(
RendererDeviceAudioQualityChangedMessage {
sampling_rate: optional_i32(&report.payload, "sampling_rate")?,
bit_depth: optional_i32(&report.payload, "bit_depth")?,
nb_channels: optional_i32(&report.payload, "nb_channels")?,
},
),
..Default::default()
}),
RendererReportType::RndrSrvrMaxAudioQualityChanged => Ok(QConnectMessage {
message_type: Some(
QConnectMessageType::MessageTypeRndrSrvrMaxAudioQualityChanged as i32,
@@ -928,6 +942,29 @@ mod tests {
use qconnect_core::QueueVersion;
use serde_json::json;
#[test]
fn maps_device_audio_quality_changed_report_to_tag_27() {
let report = RendererReport::new(
RendererReportType::RndrSrvrDeviceAudioQualityChanged,
"00000000-0000-0000-0000-000000000000",
QueueVersion { major: 1, minor: 2 },
json!({ "sampling_rate": 96000, "bit_depth": 24, "nb_channels": 2 }),
);
let msg = map_renderer_report(&report).expect("mapping should succeed");
assert_eq!(
msg.message_type,
Some(QConnectMessageType::MessageTypeRndrSrvrDeviceAudioQualityChanged as i32)
);
let dev = msg
.rndr_srvr_device_audio_quality_changed
.expect("device AQ submessage present");
assert_eq!(dev.sampling_rate, Some(96000));
assert_eq!(dev.bit_depth, Some(24));
assert_eq!(dev.nb_channels, Some(2));
assert!(msg.rndr_srvr_file_audio_quality_changed.is_none());
assert!(msg.rndr_srvr_max_audio_quality_changed.is_none());
}
#[test]
fn encodes_add_tracks_command_into_binary_batch() {
let command = QueueCommand::new(
@@ -715,6 +715,16 @@ pub struct RendererFileAudioQualityChangedMessage {
pub audio_quality: Option<i32>,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct RendererDeviceAudioQualityChangedMessage {
#[prost(int32, optional, tag = "1")]
pub sampling_rate: Option<i32>,
#[prost(int32, optional, tag = "2")]
pub bit_depth: Option<i32>,
#[prost(int32, optional, tag = "3")]
pub nb_channels: Option<i32>,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct RendererMaxAudioQualityChangedMessage {
#[prost(int32, optional, tag = "1")]
@@ -905,6 +915,9 @@ pub struct QConnectMessage {
pub rndr_srvr_volume_changed: Option<RendererVolumeChangedMessage>,
#[prost(message, optional, tag = "26")]
pub rndr_srvr_file_audio_quality_changed: Option<RendererFileAudioQualityChangedMessage>,
#[prost(message, optional, tag = "27")]
pub rndr_srvr_device_audio_quality_changed:
Option<RendererDeviceAudioQualityChangedMessage>,
#[prost(message, optional, tag = "28")]
pub rndr_srvr_max_audio_quality_changed: Option<RendererMaxAudioQualityChangedMessage>,
#[prost(message, optional, tag = "29")]
+4
View File
@@ -48,6 +48,7 @@ pub enum RendererReportType {
RndrSrvrVolumeChanged,
RndrSrvrVolumeMuted,
RndrSrvrFileAudioQualityChanged,
RndrSrvrDeviceAudioQualityChanged,
RndrSrvrMaxAudioQualityChanged,
}
@@ -62,6 +63,9 @@ impl RendererReportType {
Self::RndrSrvrFileAudioQualityChanged => {
"MESSAGE_TYPE_RNDR_SRVR_FILE_AUDIO_QUALITY_CHANGED"
}
Self::RndrSrvrDeviceAudioQualityChanged => {
"MESSAGE_TYPE_RNDR_SRVR_DEVICE_AUDIO_QUALITY_CHANGED"
}
Self::RndrSrvrMaxAudioQualityChanged => {
"MESSAGE_TYPE_RNDR_SRVR_MAX_AUDIO_QUALITY_CHANGED"
}