Send all Record On source operands and check that the follower responds
with a corresponding Record Status. Send invalid Record On source
operands and make sure that the follower returns Feature Abort with
Invalid Operand.
Signed-off-by: Deborah Brouwer <deborahbrouwer3563@xxxxxxxxx>
---
utils/cec-compliance/cec-test.cpp | 107 +++++++++++++++++++++++++++---
utils/cec-follower/cec-tuner.cpp | 28 +++++++-
2 files changed, 125 insertions(+), 10 deletions(-)
diff --git a/utils/cec-compliance/cec-test.cpp b/utils/cec-compliance/cec-test.cpp
index 0051d72a..2c64d1a0 100644
--- a/utils/cec-compliance/cec-test.cpp
+++ b/utils/cec-compliance/cec-test.cpp
@@ -48,6 +48,43 @@ static int test_play_mode(struct node *node, unsigned me, unsigned la, __u8 play
return OK;
}
+static int one_touch_rec_on_send(struct node *node, unsigned me, unsigned la, __u8 src, __u8 &rec_status)
+{
+ struct cec_msg msg;
+ struct cec_op_record_src rec_src = {};
+
+ cec_msg_init(&msg, me, la);
+ rec_src.type = src;
+ cec_msg_record_on(&msg, true, &rec_src);
+ fail_on_test(!transmit_timeout(node, &msg));
+ fail_on_test(timed_out_or_abort(&msg));
+ cec_ops_record_status(&msg, &rec_status);
+
+ return OK;
+}
+
+static bool one_touch_rec_common(__u8 rec_status)
+{
+ switch (rec_status) {
+ case CEC_OP_RECORD_STATUS_UNSUP_CA:
+ case CEC_OP_RECORD_STATUS_NO_CA_ENTITLEMENTS:
+ case CEC_OP_RECORD_STATUS_CANT_COPY_SRC:
+ case CEC_OP_RECORD_STATUS_NO_MORE_COPIES:
+ case CEC_OP_RECORD_STATUS_NO_MEDIA:
+ case CEC_OP_RECORD_STATUS_PLAYING:
+ case CEC_OP_RECORD_STATUS_ALREADY_RECORDING:
+ case CEC_OP_RECORD_STATUS_MEDIA_PROT:
+ case CEC_OP_RECORD_STATUS_NO_SIGNAL:
+ case CEC_OP_RECORD_STATUS_MEDIA_PROBLEM:
+ case CEC_OP_RECORD_STATUS_NO_SPACE:
+ case CEC_OP_RECORD_STATUS_PARENTAL_LOCK:
+ case CEC_OP_RECORD_STATUS_OTHER:
+ return true;
+ default:
+ return false;
+ }
+}
+
/* System Information */
int system_info_polling(struct node *node, unsigned me, unsigned la, bool interactive)
@@ -1215,10 +1252,6 @@ static int one_touch_rec_tv_screen(struct node *node, unsigned me, unsigned la,
static int one_touch_rec_on(struct node *node, unsigned me, unsigned la, bool interactive)
{
- /*
- TODO: Page 36 in HDMI CEC 1.4b spec lists additional behaviors that should be
- checked for.
- */
struct cec_msg msg;
struct cec_op_record_src rec_src = {};
@@ -1227,15 +1260,68 @@ static int one_touch_rec_on(struct node *node, unsigned me, unsigned la, bool in
cec_msg_record_on(&msg, true, &rec_src);
fail_on_test(!transmit_timeout(node, &msg));
fail_on_test(timed_out(&msg));
- fail_on_test(cec_has_record(1 << la) && unrecognized_op(&msg));
- if (unrecognized_op(&msg))
+ if (unrecognized_op(&msg)) {
+ fail_on_test(cec_has_record(1 << la) || cec_has_backup(1 << la));
return OK_NOT_SUPPORTED;
+ }
if (refused(&msg))
return OK_REFUSED;
if (cec_msg_status_is_abort(&msg))
return OK_PRESUMED;
- return 0;
+ __u8 rec_status;
+
+ cec_ops_record_status(&msg, &rec_status);
+ fail_on_test(rec_status != CEC_OP_RECORD_STATUS_CUR_SRC && !one_touch_rec_common(rec_status));
+
+ fail_on_test(one_touch_rec_on_send(node, me, la, CEC_OP_RECORD_SRC_DIGITAL, rec_status));
+ fail_on_test(rec_status != CEC_OP_RECORD_STATUS_DIG_SERVICE &&
+ rec_status != CEC_OP_RECORD_STATUS_NO_DIG_SERVICE &&
+ rec_status != CEC_OP_RECORD_STATUS_NO_SERVICE &&
+ !one_touch_rec_common(rec_status));
+
+ fail_on_test(one_touch_rec_on_send(node, me, la, CEC_OP_RECORD_SRC_ANALOG, rec_status));
+ fail_on_test(rec_status != CEC_OP_RECORD_STATUS_ANA_SERVICE &&
+ rec_status != CEC_OP_RECORD_STATUS_NO_ANA_SERVICE &&
+ rec_status != CEC_OP_RECORD_STATUS_NO_SERVICE &&
+ !one_touch_rec_common(rec_status));
+
+ fail_on_test(one_touch_rec_on_send(node, me, la, CEC_OP_RECORD_SRC_EXT_PLUG, rec_status));
+ fail_on_test(rec_status != CEC_OP_RECORD_STATUS_EXT_INPUT &&
+ rec_status != CEC_OP_RECORD_STATUS_INVALID_EXT_PLUG &&
+ !one_touch_rec_common(rec_status));
+
+ fail_on_test(one_touch_rec_on_send(node, me, la, CEC_OP_RECORD_SRC_EXT_PHYS_ADDR, rec_status));
+ fail_on_test(rec_status != CEC_OP_RECORD_STATUS_EXT_INPUT &&
+ rec_status != CEC_OP_RECORD_STATUS_INVALID_EXT_PHYS_ADDR &&
+ !one_touch_rec_common(rec_status));
+
+ return OK;
+}
+
+static int one_touch_rec_on_invalid(struct node *node, unsigned me, unsigned la, bool interactive)
+{
+ struct cec_msg msg;
+
+ cec_msg_init(&msg, me, la);
+ cec_msg_record_on_own(&msg);
+ msg.msg[2] = 0; /* Invalid source operand */
+ fail_on_test(!transmit_timeout(node, &msg));
+ if (unrecognized_op(&msg))
+ return OK_NOT_SUPPORTED;
+ fail_on_test(!cec_msg_status_is_abort(&msg));
+ fail_on_test(abort_reason(&msg) != CEC_OP_ABORT_INVALID_OP);
+
+ cec_msg_init(&msg, me, la);
+ cec_msg_record_on_own(&msg);
+ msg.msg[2] = 6; /* Invalid source operand */
+ fail_on_test(!transmit_timeout(node, &msg));
+ if (unrecognized_op(&msg))
+ return OK_NOT_SUPPORTED;
+ fail_on_test(!cec_msg_status_is_abort(&msg));
+ fail_on_test(abort_reason(&msg) != CEC_OP_ABORT_INVALID_OP);
+
+ return OK;
}
static int one_touch_rec_off(struct node *node, unsigned me, unsigned la, bool interactive)
@@ -1260,7 +1346,12 @@ static int one_touch_rec_off(struct node *node, unsigned me, unsigned la, bool i
static const vec_remote_subtests one_touch_rec_subtests{
{ "Record TV Screen", CEC_LOG_ADDR_MASK_TV, one_touch_rec_tv_screen },
- { "Record On", CEC_LOG_ADDR_MASK_RECORD, one_touch_rec_on },
+ { "Record On", CEC_LOG_ADDR_MASK_RECORD | CEC_LOG_ADDR_MASK_BACKUP, one_touch_rec_on },
+ {
+ "Record On Invalid Operand",
+ CEC_LOG_ADDR_MASK_RECORD | CEC_LOG_ADDR_MASK_BACKUP,
+ one_touch_rec_on_invalid,
+ },
{ "Record Off", CEC_LOG_ADDR_MASK_RECORD, one_touch_rec_off },
};
diff --git a/utils/cec-follower/cec-tuner.cpp b/utils/cec-follower/cec-tuner.cpp
index fd11bd10..ebceb064 100644
--- a/utils/cec-follower/cec-tuner.cpp
+++ b/utils/cec-follower/cec-tuner.cpp
@@ -606,10 +606,34 @@ void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, uns
return;
}
case CEC_MSG_RECORD_ON:
- if (!cec_has_record(1 << me))
+ if (!cec_has_record(1 << me) && !cec_has_backup(1 << me))
+ break;
+
+ struct cec_op_record_src rec_src;
+ __u8 rec_status;
+
+ cec_ops_record_on(&msg, &rec_src);
+
+ switch (rec_src.type) {
+ case CEC_OP_RECORD_SRC_OWN:
+ rec_status = CEC_OP_RECORD_STATUS_CUR_SRC;
+ break;
+ case CEC_OP_RECORD_SRC_DIGITAL:
+ rec_status = CEC_OP_RECORD_STATUS_DIG_SERVICE;
break;
+ case CEC_OP_RECORD_SRC_ANALOG:
+ rec_status = CEC_OP_RECORD_STATUS_ANA_SERVICE;
+ break;
+ case CEC_OP_RECORD_SRC_EXT_PLUG:
+ case CEC_OP_RECORD_SRC_EXT_PHYS_ADDR:
+ rec_status = CEC_OP_RECORD_STATUS_EXT_INPUT;
+ break;
+ default:
+ reply_feature_abort(node, &msg, CEC_OP_ABORT_INVALID_OP);
+ return;
+ }
cec_msg_set_reply_to(&msg, &msg);
- cec_msg_record_status(&msg, CEC_OP_RECORD_STATUS_CUR_SRC);
+ cec_msg_record_status(&msg, rec_status);
transmit(node, &msg);
return;
case CEC_MSG_RECORD_OFF:
--
2.25.1
