Skip to contentSkip to conversation

cec-compliance: audio return channel tests

PATCH New Jiunn Chang 2 participants 2 messages Sep 6, 2019 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cec-compliance: audio return channel tests

For devices on a HDMI ARC link, sinks can only support transmitter devices and sources and only support receiver devices.

This patch checks to see if the DUT is an transmitter or receiver and has the ARC flag set properly from the device.

This should apply to devices that support the HDMI CEC 1.4 spec going forward when ARC was introduced.

Signed-off-by Jiunn Chang <c0d1n61at3 at gmail.com>
---
 utils/cec-compliance/cec-test-audio.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
utils/cec-compliance/cec-test-audio.cpp +24 -0
index 872bb9ad..da2ed1d1 100644
@@ -297,11 +297,35 @@ static int arc_terminate_rx(struct node *node, unsigned me, unsigned la, bool in
 	return 0;
 }
 
+static int arc_sink_tx(struct node *node, unsigned me, unsigned la, bool interactive)
+{
+	/* Check if we are upstream from the device. If we are, then the device is
+	   an HDMI source, which means that it is an ARC receiver, not a transmitter. */
+	if (pa_is_upstream_from(node->phys_addr, node->remote[la].phys_addr))
+		return NOTAPPLICABLE;
+	fail_on_test(!node->remote[la].has_arc_tx);
+
+	return 0;
+}
+
+static int arc_source_rx(struct node *node, unsigned me, unsigned la, bool interactive)
+{
+	/* Check if the DUT is upstream from us. If it is, then it is an
+	   HDMI sink, which means that it is an ARC transmitter, not receiver. */
+	if (pa_is_upstream_from(node->remote[la].phys_addr, node->phys_addr))
+		return NOTAPPLICABLE;
+	fail_on_test(!node->remote[la].has_arc_rx);
+
+	return 0;
+}
+
 struct remote_subtest arc_subtests[] = {
 	{ "Initiate ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_initiate_rx },
 	{ "Terminate ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_terminate_rx },
 	{ "Initiate ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_initiate_tx },
 	{ "Terminate ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_terminate_tx },
+	{ "Sink ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_sink_tx },
+	{ "Source ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_source_rx },
 };
 
 const unsigned arc_subtests_size = ARRAY_SIZE(arc_subtests);
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 cec-compliance: audio return channel tests

Quoted 45 lines · Jiunn Chang

For devices on a HDMI ARC link, sinks can only support transmitter devices and sources and only support receiver devices.

This patch checks to see if the DUT is an transmitter or receiver and has the ARC flag set properly from the device.

This should apply to devices that support the HDMI CEC 1.4 spec going forward when ARC was introduced.

Signed-off-by Jiunn Chang <c0d1n61at3 at gmail.com>
---
 utils/cec-compliance/cec-test-audio.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
utils/cec-compliance/cec-test-audio.cpp +22 -0
index 872bb9ad..da2ed1d1 100644
@@ -297,11 +297,35 @@ static int arc_terminate_rx(struct node *node, unsigned me, unsigned la, bool in
 	return 0;
 }
 
+static int arc_sink_tx(struct node *node, unsigned me, unsigned la, bool interactive)
+{
+	/* Check if we are upstream from the device. If we are, then the device is
+	   an HDMI source, which means that it is an ARC receiver, not a transmitter. */
+	if (pa_is_upstream_from(node->phys_addr, node->remote[la].phys_addr))
+		return NOTAPPLICABLE;
+	fail_on_test(!node->remote[la].has_arc_tx);
+
+	return 0;
+}
+
+static int arc_source_rx(struct node *node, unsigned me, unsigned la, bool interactive)
+{
+	/* Check if the DUT is upstream from us. If it is, then it is an
+	   HDMI sink, which means that it is an ARC transmitter, not receiver. */
+	if (pa_is_upstream_from(node->remote[la].phys_addr, node->phys_addr))
+		return NOTAPPLICABLE;
+	fail_on_test(!node->remote[la].has_arc_rx);
+
+	return 0;
+}
+

utils/cec-compliance/cec-test-audio.cpp static int arc_terminate_rx(struct node *node, unsigned me, unsigned la, bool in · line 331

Quoted 10 lines
utils/cec-compliance/cec-test-audio.cpp +2 -0
 struct remote_subtest arc_subtests[] = {
 	{ "Initiate ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_initiate_rx },
 	{ "Terminate ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_terminate_rx },
 	{ "Initiate ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_initiate_tx },
 	{ "Terminate ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_terminate_tx },
+	{ "Sink ARC (TX)", CEC_LOG_ADDR_MASK_ALL, arc_sink_tx },
+	{ "Source ARC (RX)", CEC_LOG_ADDR_MASK_ALL, arc_source_rx },
 };
 
 const unsigned arc_subtests_size = ARRAY_SIZE(arc_subtests);

This isn't right. First of all, the remote device may not have ARC support at all, so failing if has_arc_rx/tx is false is wrong. And in addition, CEC versions < 2 do not signal ARC support since they don't have the Give Device Features message.

The second is to test against pa_is_upstream_from: a remote device such as and AV receiver may have ARC support on both sink and source.

Just add the checks to system_info_give_features(): there are already checks for has_rec_tv, and the new checks are similar to that: a TV can't have has_arc_rx, and a Playback device can't have has_arc_tx.

Regards,

Hans