cec-follower: increase accuracy Audio Rate Control
v2 cover cec-follower: increase accuracy Audio Rate Control
Changes since v1:
* Patch 1:
cec-follower: increase precision of Audio Rate Control active sensing
* new patch
* Patch 2:
cec-follower: detect the cessation of Audio Rate Control messages
* Keep the aud_rate_msg_interval_check in processMsg to avoid missing late messages that arrive between periodic interval checks.
* Swap arguments so that struct node appears first.
* Add blank line for readability.
Deborah Brouwer (2):
cec-follower: increase precision of Audio Rate Control active sensing
cec-follower: detect the cessation of Audio Rate Control messages
utils/cec-follower/cec-processing.cpp | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
--
2.17.1
PATCH v2 1/2 cec-follower: increase precision of Audio Rate Control active sensing
Measure the interval since the last audio rate control message in nanoseconds instead of seconds. Increasing the precision catches audio rate messages that are late by less than a second.
--- utils/cec-follower/cec-processing.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
utils/cec-follower/cec-processing.cpp +4 -3
@@ -29,8 +29,8 @@ /* 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 +/* The maximum interval in nanoseconds between audio rate messages as defined in the spec */ +#define MAX_AUD_RATE_MSG_INTERVAL 2000000000 struct cec_enum_values { const char *type_name;
@@ -241,7 +241,8 @@ static void aud_rate_msg_interval_check(__u64 ts_new, __u64 ts_old) * turned off the audio rate control. */ if (ts_old) { - unsigned interval = (ts_new - ts_old) / 1000000000; + __u64 interval = ts_new - ts_old; + 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");
Signature · 1 line
2.17.1
Re: [PATCH v2 1/2] cec-follower: increase precision of Audio Rate Control active sensing
Quoted 14 lines · Deborah Brouwer
Measure the interval since the last audio rate control message in nanoseconds instead of seconds. Increasing the precision catches audio rate messages that are late by less than a second.
Signed-off-by Deborah Brouwer <[email protected]>--- utils/cec-follower/cec-processing.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)utils/cec-follower/cec-processing.cpp +0
-0
utils/cec-follower/cec-processing.cpp line 33
Quoted 7 lines
utils/cec-follower/cec-processing.cpp +2
-2@@ -29,8 +29,8 @@ /* 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 +/* The maximum interval in nanoseconds between audio rate messages as defined in the spec */ +#define MAX_AUD_RATE_MSG_INTERVAL 2000000000
It's a bit easier to read if you write this as:
#define MAX_AUD_RATE_MSG_INTERVAL_NS (2 * 1000000000ULL)
It's helpful to add the unit as a suffix to the define name and to write it as a multiplication of seconds times nsecs_per_sec.
Also ULL helps cast the expression to an unsigned long long (64 bit).
Not strictly necessary, but since we check intervals using __u64 it doesn't hurt either.
Regards,
Hans
Quoted 14 lines
utils/cec-follower/cec-processing.cpp +2
-1struct cec_enum_values { const char *type_name;@@ -241,7 +241,8 @@ static void aud_rate_msg_interval_check(__u64 ts_new, __u64 ts_old) * turned off the audio rate control. */ if (ts_old) { - unsigned interval = (ts_new - ts_old) / 1000000000; + __u64 interval = ts_new - ts_old; + 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");
PATCH v2 2/2 cec-follower: detect the cessation of Audio Rate Control messages
In reply to Deborah BrouwerIf the controlling device simply stops sending audio rate messages, give the cec-follower the ability to detect that it has not received an audio rate message within 2 seconds as required. The cec-follower will quit the audio rate controlled mode. Eliminate the need to measure an interval between two audio rate messages.
--- utils/cec-follower/cec-processing.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
utils/cec-follower/cec-processing.cpp +13 -7
@@ -233,19 +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) +static void aud_rate_msg_interval_check(struct node *node, __u64 ts_new) { /* - * 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. + * The interval since the last audio rate message is not relevant + * unless the Source is currently in audio rate controlled mode. */ + __u64 ts_old = node->state.last_aud_rate_rx_ts; + if (ts_old) { __u64 interval = ts_new - ts_old; if (interval > MAX_AUD_RATE_MSG_INTERVAL) { - warn("The interval between Audio Rate Control messages was greater\n"); + warn("The interval since the last Audio Rate Control message was greater\n"); warn("than the Maxiumum Audio Rate Message Interval (2s).\n"); + warn("Turning off audio rate control.\n"); + node->state.last_aud_rate_rx_ts = 0; } } }
@@ -803,7 +806,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) 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); + aud_rate_msg_interval_check(node, msg.rx_ts); node->state.last_aud_rate_rx_ts = 0; return; case CEC_OP_AUD_RATE_WIDE_STD:
@@ -812,7 +815,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) 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); + aud_rate_msg_interval_check(node, msg.rx_ts); node->state.last_aud_rate_rx_ts = msg.rx_ts; return; default:
@@ -1034,6 +1037,9 @@ void testProcessing(struct node *node, bool wallclock) node->state.rc_state = NOPRESS; } } + + if (node->has_aud_rate) + aud_rate_msg_interval_check(node, ts_now); } mode = CEC_MODE_INITIATOR; doioctl(node, CEC_S_MODE, &mode);
Signature · 1 line
2.17.1
Re: [PATCH v2 2/2] cec-follower: detect the cessation of Audio Rate Control messages
Quoted 18 lines · Deborah Brouwer
If the controlling device simply stops sending audio rate messages, give the cec-follower the ability to detect that it has not received an audio rate message within 2 seconds as required. The cec-follower will quit the audio rate controlled mode. Eliminate the need to measure an interval between two audio rate messages.
Signed-off-by Deborah Brouwer <[email protected]>--- utils/cec-follower/cec-processing.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)utils/cec-follower/cec-processing.cpp +0
-0@@ -233,19 +233,22 @@ static __u8 current_power_state(struct node *node) return CEC_OP_POWER_STATUS_TO_STANDBY; }
utils/cec-follower/cec-processing.cpp static __u8 current_power_state(struct node *node) · line 240
Quoted 10 lines
utils/cec-follower/cec-processing.cpp +3
-4-static void aud_rate_msg_interval_check(__u64 ts_new, __u64 ts_old) +static void aud_rate_msg_interval_check(struct node *node, __u64 ts_new) { /* - * 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. + * The interval since the last audio rate message is not relevant + * unless the Source is currently in audio rate controlled mode.
I think this can be clarified if you extend the comment a bit and avoid the double negation (not...unless):
* The interval since the last audio rate message is only relevant
* if the Source is currently in audio rate controlled mode
* (i.e. state.last_aud_rate_rx_ts != 0).
utils/cec-follower/cec-processing.cpp static __u8 current_power_state(struct node *node) · line 249
Quoted 10 lines
utils/cec-follower/cec-processing.cpp +3
-1*/ + __u64 ts_old = node->state.last_aud_rate_rx_ts; + if (ts_old) { __u64 interval = ts_new - ts_old; if (interval > MAX_AUD_RATE_MSG_INTERVAL) { - warn("The interval between Audio Rate Control messages was greater\n"); + warn("The interval since the last Audio Rate Control message was greater\n"); warn("than the Maxiumum Audio Rate Message Interval (2s).\n");
This is a bit too verbose. How about this:
warn("The interval since the last Audio Rate Control message was > 2s.\n");Regards,
Hans
Quoted 34 lines
utils/cec-follower/cec-processing.cpp +7
-2+ warn("Turning off audio rate control.\n"); + node->state.last_aud_rate_rx_ts = 0; } } }@@ -803,7 +806,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) 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); + aud_rate_msg_interval_check(node, msg.rx_ts); node->state.last_aud_rate_rx_ts = 0; return; case CEC_OP_AUD_RATE_WIDE_STD:@@ -812,7 +815,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) 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); + aud_rate_msg_interval_check(node, msg.rx_ts); node->state.last_aud_rate_rx_ts = msg.rx_ts; return; default:@@ -1034,6 +1037,9 @@ void testProcessing(struct node *node, bool wallclock) node->state.rc_state = NOPRESS; } } + + if (node->has_aud_rate) + aud_rate_msg_interval_check(node, ts_now); } mode = CEC_MODE_INITIATOR; doioctl(node, CEC_S_MODE, &mode);