This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: cec-follower: fix cec-tuner.cpp Author: Jiunn Chang <c0d1n61...@gmail.com> Date: Thu Sep 19 12:47:00 2019 -0500 Remove static from reply_feature_abort() in cec-processing.cpp so it can be used in cec-tuner.cpp. This is to maintain testing logic for PRESUMED_OK which replies on the feature abort message. Also needed is a boolean for broadcast messages that should not be aborted. Signed-off-by: Jiunn Chang <c0d1n61...@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/cec-follower/cec-follower.h | 2 ++ utils/cec-follower/cec-processing.cpp | 6 +++--- utils/cec-follower/cec-tuner.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=a42e008316600b79e6833420612afcb8fc4a2171 diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h index 9f5f1be4bdc8..954e001fab58 100644 --- a/utils/cec-follower/cec-follower.h +++ b/utils/cec-follower/cec-follower.h @@ -223,6 +223,8 @@ void sad_encode(const struct short_audio_desc *sad, __u32 *descriptor); void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, unsigned me); // CEC processing +void reply_feature_abort(struct node *node, struct cec_msg *msg, + __u8 reason = CEC_OP_ABORT_UNRECOGNIZED_OP); void testProcessing(struct node *node, bool wallclock); // cec-log.c diff --git a/utils/cec-follower/cec-processing.cpp b/utils/cec-follower/cec-processing.cpp index 15cedddf15cc..3db88f1a14ae 100644 --- a/utils/cec-follower/cec-processing.cpp +++ b/utils/cec-follower/cec-processing.cpp @@ -211,7 +211,7 @@ static void log_event(struct cec_event &ev, bool wallclock) printf("\tTimestamp: %s\n", ts2s(ev.ts, wallclock).c_str()); } -static void reply_feature_abort(struct node *node, struct cec_msg *msg, __u8 reason = CEC_OP_ABORT_UNRECOGNIZED_OP) +void reply_feature_abort(struct node *node, struct cec_msg *msg, __u8 reason) { unsigned la = cec_msg_initiator(msg); __u8 opcode = cec_msg_opcode(msg); @@ -608,7 +608,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) case CEC_MSG_DECK_STATUS: return; - /* Tuner Centric Messages */ + /* Tuner/Record/Timer Messages */ case CEC_MSG_GIVE_TUNER_DEVICE_STATUS: case CEC_MSG_TUNER_DEVICE_STATUS: @@ -630,7 +630,7 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) case CEC_MSG_TIMER_CLEARED_STATUS: case CEC_MSG_TIMER_STATUS: process_tuner_record_timer_msgs(node, msg, me); - break; + return; /* Dynamic Auto Lipsync */ diff --git a/utils/cec-follower/cec-tuner.cpp b/utils/cec-follower/cec-tuner.cpp index 5e794d7141cb..a1e349bd0aef 100644 --- a/utils/cec-follower/cec-tuner.cpp +++ b/utils/cec-follower/cec-tuner.cpp @@ -9,6 +9,8 @@ void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, unsigned me) { + bool is_bcast = cec_msg_is_broadcast(&msg); + switch (msg.msg[1]) { @@ -136,4 +138,9 @@ void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, uns default: break; } + + if (is_bcast) + return; + + reply_feature_abort(node, &msg); } _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
