The controlling device should send an Audio Rate Control message at least
once every 2 seconds for active sensing. Add a test in cec-compliance to
delay the message by more than 2 seconds. Check the interval between
messages in cec-follower and warn if the delay is greater than 2 seconds.
Signed-off-by: Deborah Brouwer <deborahbrouwer3563@xxxxxxxxx>
---
utils/cec-compliance/cec-test-audio.cpp | 34 +++++++++++++++---
utils/cec-follower/cec-follower.cpp | 1 +
utils/cec-follower/cec-follower.h | 1 +
utils/cec-follower/cec-processing.cpp | 46 ++++++++++++++++++++-----
4 files changed, 69 insertions(+), 13 deletions(-)
diff --git a/utils/cec-compliance/cec-test-audio.cpp b/utils/cec-compliance/cec-test-audio.cpp
index 4674295b..e1386dbb 100644
--- a/utils/cec-compliance/cec-test-audio.cpp
+++ b/utils/cec-compliance/cec-test-audio.cpp
@@ -851,10 +851,6 @@ const vec_remote_subtests sac_subtests{
/* Audio Rate Control */
-/*
- TODO: These are very rudimentary tests which should be expanded.
- */
-
static int audio_rate_ctl_set_audio_rate(struct node *node, unsigned me, unsigned la, bool interactive)
{
struct cec_msg msg = {};
@@ -875,6 +871,30 @@ static int audio_rate_ctl_set_audio_rate(struct node *node, unsigned me, unsigne
return OK_PRESUMED;
}
+static int audio_rate_ctl_active_sensing(struct node *node, unsigned me, unsigned la, bool interactive)
+{
+ /*
+ * The source shall go back to Rate Control Off if no Set Audio Rate message is
+ * received for more than 2 seconds.
+ */
+ if (!node->remote[la].has_aud_rate)
+ return NOTAPPLICABLE;
+
+ struct cec_msg msg = {};
+
+ cec_msg_init(&msg, me, la);
+
+ /*
+ * Since this subtest runs immediately after Set Audio Rate, delaying the interval
+ * between the two tests is sufficient to test that the Source turns off rate control.
+ */
+ sleep(3);
+ cec_msg_set_audio_rate(&msg, CEC_OP_AUD_RATE_OFF);
+ fail_on_test(!transmit_timeout(node, &msg));
+ fail_on_test_v2(node->remote[la].cec_version, unrecognized_op(&msg));
+ return OK_PRESUMED;
+}
+
const vec_remote_subtests audio_rate_ctl_subtests{
{
"Set Audio Rate",
@@ -882,4 +902,10 @@ const vec_remote_subtests audio_rate_ctl_subtests{
CEC_LOG_ADDR_MASK_TUNER | CEC_LOG_ADDR_MASK_AUDIOSYSTEM,
audio_rate_ctl_set_audio_rate,
},
+ {
+ "Audio Rate Active Sensing",
+ CEC_LOG_ADDR_MASK_PLAYBACK | CEC_LOG_ADDR_MASK_RECORD |
+ CEC_LOG_ADDR_MASK_TUNER | CEC_LOG_ADDR_MASK_AUDIOSYSTEM,
+ audio_rate_ctl_active_sensing,
+ },
};
diff --git a/utils/cec-follower/cec-follower.cpp b/utils/cec-follower/cec-follower.cpp
index bb63f90d..184cf16a 100644
--- a/utils/cec-follower/cec-follower.cpp
+++ b/utils/cec-follower/cec-follower.cpp
@@ -314,6 +314,7 @@ void state_init(struct node &node)
node.state.volume = 50;
node.state.mute = false;
tuner_dev_info_init(&node.state);
+ node.state.last_aud_rate_rx_ts = 0;
}
int main(int argc, char **argv)
diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h
index 7806a4b6..391b9ab4 100644
--- a/utils/cec-follower/cec-follower.h
+++ b/utils/cec-follower/cec-follower.h
@@ -51,6 +51,7 @@ struct state {
bool tuner_report_changes;
bool deck_report_changes;
unsigned toggle_power_status;
+ __u64 last_aud_rate_rx_ts;
};
struct node {
diff --git a/utils/cec-follower/cec-processing.cpp b/utils/cec-follower/cec-processing.cpp
index 02440747..fc0d5df0 100644
--- a/utils/cec-follower/cec-processing.cpp
+++ b/utils/cec-follower/cec-processing.cpp
@@ -29,6 +29,9 @@
/* Time between each polling message sent to a device */
#define POLL_PERIOD 15000
+/* The maximum interval in seconds between audio rate messages as defined in the spec */
+#define MAX_AUD_RATE_MSG_INTERVAL 2
+
struct cec_enum_values {
const char *type_name;
__u8 value;
@@ -230,6 +233,22 @@ static __u8 current_power_state(struct node *node)
return CEC_OP_POWER_STATUS_TO_STANDBY;
}
+static void aud_rate_msg_interval_check(__u64 ts_new, __u64 ts_old)
+{
+ /*
+ * The interval between messages is not relevant if this is the
+ * first audio rate control message or if the previous message
+ * turned off the audio rate control.
+ */
+ if (ts_old) {
+ unsigned interval = (ts_new - ts_old) / 1000000000;
+ if (interval > MAX_AUD_RATE_MSG_INTERVAL) {
+ warn("The interval between Audio Rate Control messages was greater\n");
+ warn("than the Maxiumum Audio Rate Message Interval (2s).\n");
+ }
+ }
+}
+
static void processMsg(struct node *node, struct cec_msg &msg, unsigned me)
{
__u8 to = cec_msg_destination(&msg);
@@ -775,18 +794,27 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me)
return;
- /*
- Audio Rate Control
-
- This is only a basic implementation.
-
- TODO: Set Audio Rate shall be sent at least every 2 seconds by
- the controlling device. This should be checked and kept track of.
- */
+ /* Audio Rate Control */
case CEC_MSG_SET_AUDIO_RATE:
- if (node->has_aud_rate)
+ if (!node->has_aud_rate)
+ break;
+
+ switch (msg.msg[2]) {
+ case CEC_OP_AUD_RATE_OFF:
+ aud_rate_msg_interval_check(msg.rx_ts, node->state.last_aud_rate_rx_ts);
+ node->state.last_aud_rate_rx_ts = 0;
+ return;
+ case CEC_OP_AUD_RATE_WIDE_STD:
+ case CEC_OP_AUD_RATE_WIDE_FAST:
+ case CEC_OP_AUD_RATE_WIDE_SLOW:
+ case CEC_OP_AUD_RATE_NARROW_STD:
+ case CEC_OP_AUD_RATE_NARROW_FAST:
+ case CEC_OP_AUD_RATE_NARROW_SLOW:
+ aud_rate_msg_interval_check(msg.rx_ts, node->state.last_aud_rate_rx_ts);
+ node->state.last_aud_rate_rx_ts = msg.rx_ts;
return;
+ }
break;
--
2.17.1
