[Linux-kernel-mentees] [PATCH 1/2] cec-follower: add tuner step increment/decrement
From: Hans Verkuil <hidden>
Date: 2019-09-24 15:20:32
Also in:
linux-media
On 9/24/19 4:17 PM, Jiunn Chang wrote:
quoted hunk ↗ jump to hunk
Tuner step increment/decrement will select the next highest or next lowest service frequency. There are a total of three possible frequencies from analog_freqs_khz given a broadcast type and system. Opcodes implemented: - <Tuner Step Increment> - <Tuner Step Decrement> Signed-off-by: Jiunn Chang <c0d1n61at3 at gmail.com> --- utils/cec-follower/cec-tuner.cpp | 49 ++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 3 deletions(-)diff --git a/utils/cec-follower/cec-tuner.cpp b/utils/cec-follower/cec-tuner.cpp index acc3fd00..adb2f63c 100644 --- a/utils/cec-follower/cec-tuner.cpp +++ b/utils/cec-follower/cec-tuner.cpp@@ -135,6 +135,22 @@ static bool analog_set_tuner_dev_info(struct node *node, struct cec_msg *msg) return false; } +static int analog_find_freq_index(struct cec_op_tuner_device_info *info) +{ + if (info->analog.ana_freq == 0) + return -1;
Can this ever be 0? With the current emulation code this cannot happen, I think. I'd drop this check.
+
+ int ana_freq_khz = (info->analog.ana_freq * 625) / 10;
+
+ for (int i = 0; i < NUM_ANALOG_FREQS; i++) {
+ int freq = analog_freqs_khz[info->analog.ana_bcast_type][info->analog.bcast_system][i];
+
+ if (ana_freq_khz == freq)
+ return i;
+ }
+ return -1;If it can't be found, just return 0. Again, this can't happen with the current code.
quoted hunk ↗ jump to hunk
+} + void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, unsigned me) { bool is_bcast = cec_msg_is_broadcast(&msg);@@ -178,12 +194,39 @@ void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, uns return; case CEC_MSG_SELECT_DIGITAL_SERVICE: - case CEC_MSG_TUNER_STEP_DECREMENT: - case CEC_MSG_TUNER_STEP_INCREMENT: - if (!cec_has_tuner(1 << me)) + case CEC_MSG_TUNER_STEP_DECREMENT: { + if (!cec_has_tuner(1 << me) && !cec_has_tv(1 << me)) break; + + struct cec_op_tuner_device_info *info = &node->state.tuner_dev_info; + int idx = analog_find_freq_index(info); + + if (idx == -1 || idx == 0)
If idx == 0, then just wrap around to the highest index. That's what typically happens when you press Previous Channel on the TV's remote as well.
+ return;
+ if (info->is_analog) {
+ int freq = analog_freqs_khz[info->analog.ana_bcast_type][info->analog.bcast_system][--idx];
+
+ info->analog.ana_freq = (freq * 10) / 625;
+ }
return;
+ }
+
+ case CEC_MSG_TUNER_STEP_INCREMENT: {
+ if (!cec_has_tuner(1 << me) && !cec_has_tv(1 << me))
+ break;
+ struct cec_op_tuner_device_info *info = &node->state.tuner_dev_info;
+ int idx = analog_find_freq_index(info);
+
+ if (idx == -1 || idx == 2)Same here, just wrap around to 0. And don't use 2, use the NUM_ANALOG_FREQS define.
+ return;
+ if (info->is_analog) {
+ int freq = analog_freqs_khz[info->analog.ana_bcast_type][info->analog.bcast_system][++idx];
+
+ info->analog.ana_freq = (freq * 10) / 625;
+ }
+ return;
+ }
/*
One Touch RecordRegards, Hans