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: create cec-tuner.cpp Author: Jiunn Chang <c0d1n61...@gmail.com> Date: Mon Sep 16 08:23:08 2019 -0500 Move tuner control, one touch record, and timer programming into cec-tuner.cpp. These features are all tuner related and involve the tuner as a central feature to be able to test. Signed-off-by: Jiunn Chang <c0d1n61...@gmail.com> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/cec-follower/Makefile.am | 2 +- utils/cec-follower/cec-follower.h | 3 + utils/cec-follower/cec-processing.cpp | 109 ++------------------------ utils/cec-follower/cec-tuner.cpp | 139 ++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 105 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=a32b00d715f48c6aa8c889a1aabd3fcdcee22b0f diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am index 9b0a48b06157..294a6ab458ce 100644 --- a/utils/cec-follower/Makefile.am +++ b/utils/cec-follower/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = cec-follower man_MANS = cec-follower.1 -cec_follower_SOURCES = cec-follower.cpp cec-follower.h cec-processing.cpp cec-log.cpp cec-info.cpp +cec_follower_SOURCES = cec-follower.cpp cec-follower.h cec-processing.cpp cec-tuner.cpp cec-log.cpp cec-info.cpp cec_follower_CPPFLAGS = -I$(top_srcdir)/utils/common cec_follower_LDFLAGS = -lrt diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h index 0998382cc901..9f5f1be4bdc8 100644 --- a/utils/cec-follower/cec-follower.h +++ b/utils/cec-follower/cec-follower.h @@ -219,6 +219,9 @@ std::string audio_format_id_code2s(__u8 audio_format_id, __u8 audio_format_code) std::string opcode2s(const struct cec_msg *msg); void sad_encode(const struct short_audio_desc *sad, __u32 *descriptor); +// cec-tuner.cpp +void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, unsigned me); + // CEC processing void testProcessing(struct node *node, bool wallclock); diff --git a/utils/cec-follower/cec-processing.cpp b/utils/cec-follower/cec-processing.cpp index fa7687c9af88..15cedddf15cc 100644 --- a/utils/cec-follower/cec-processing.cpp +++ b/utils/cec-follower/cec-processing.cpp @@ -608,128 +608,29 @@ static void processMsg(struct node *node, struct cec_msg &msg, unsigned me) case CEC_MSG_DECK_STATUS: return; + /* Tuner Centric Messages */ - /* - Tuner Control - - This is only a basic implementation. - - TODO: Device state should change when selecting services etc. - */ - - case CEC_MSG_GIVE_TUNER_DEVICE_STATUS: { - if (!cec_has_tuner(1 << me)) - break; - - struct cec_op_tuner_device_info tuner_dev_info = {}; - - cec_msg_set_reply_to(&msg, &msg); - tuner_dev_info.rec_flag = CEC_OP_REC_FLAG_NOT_USED; - tuner_dev_info.tuner_display_info = CEC_OP_TUNER_DISPLAY_INFO_NONE; - tuner_dev_info.is_analog = false; - tuner_dev_info.digital.service_id_method = CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL; - tuner_dev_info.digital.dig_bcast_system = CEC_OP_DIG_SERVICE_BCAST_SYSTEM_DVB_C; - tuner_dev_info.digital.channel.channel_number_fmt = CEC_OP_CHANNEL_NUMBER_FMT_1_PART; - tuner_dev_info.digital.channel.minor = 1; - - cec_msg_tuner_device_status(&msg, &tuner_dev_info); - transmit(node, &msg); - return; - } - + case CEC_MSG_GIVE_TUNER_DEVICE_STATUS: case CEC_MSG_TUNER_DEVICE_STATUS: - return; - case CEC_MSG_SELECT_ANALOGUE_SERVICE: case CEC_MSG_SELECT_DIGITAL_SERVICE: case CEC_MSG_TUNER_STEP_DECREMENT: case CEC_MSG_TUNER_STEP_INCREMENT: - if (!cec_has_tuner(1 << me)) - break; - return; - - - /* - One Touch Record - - This is only a basic implementation. - - TODO: - - If we are a TV, we should only send Record On if the - remote end is a Recording device or Reserved. Otherwise ignore. - - - Device state should reflect whether we are recording, etc. In - recording mode we should ignore Standby messages. - */ - - case CEC_MSG_RECORD_TV_SCREEN: { - if (!node->has_rec_tv) - break; - - struct cec_op_record_src rec_src = {}; - - rec_src.type = CEC_OP_RECORD_SRC_OWN; - cec_msg_set_reply_to(&msg, &msg); - cec_msg_record_on(&msg, false, &rec_src); - transmit(node, &msg); - return; - } + case CEC_MSG_RECORD_TV_SCREEN: case CEC_MSG_RECORD_ON: - if (!cec_has_record(1 << me)) - break; - cec_msg_set_reply_to(&msg, &msg); - cec_msg_record_status(&msg, CEC_OP_RECORD_STATUS_CUR_SRC); - transmit(node, &msg); - return; case CEC_MSG_RECORD_OFF: - if (!cec_has_record(1 << me)) - break; - cec_msg_set_reply_to(&msg, &msg); - cec_msg_record_status(&msg, CEC_OP_RECORD_STATUS_TERMINATED_OK); - transmit(node, &msg); - return; case CEC_MSG_RECORD_STATUS: - return; - - - /* - Timer Programming - - This is only a basic implementation. - - TODO/Ideas: - - Act like an actual recording device; keep track of recording - schedule and act correctly when colliding timers are set. - - Emulate a finite storage space for recordings - */ - case CEC_MSG_SET_ANALOGUE_TIMER: case CEC_MSG_SET_DIGITAL_TIMER: case CEC_MSG_SET_EXT_TIMER: - if (!cec_has_record(1 << me)) - break; - cec_msg_set_reply_to(&msg, &msg); - cec_msg_timer_status(&msg, CEC_OP_TIMER_OVERLAP_WARNING_NO_OVERLAP, - CEC_OP_MEDIA_INFO_NO_MEDIA, - CEC_OP_PROG_INFO_ENOUGH_SPACE, 0, 0, 0); - transmit(node, &msg); - return; case CEC_MSG_CLEAR_ANALOGUE_TIMER: case CEC_MSG_CLEAR_DIGITAL_TIMER: case CEC_MSG_CLEAR_EXT_TIMER: - if (!cec_has_record(1 << me)) - break; - cec_msg_set_reply_to(&msg, &msg); - cec_msg_timer_cleared_status(&msg, CEC_OP_TIMER_CLR_STAT_CLEARED); - transmit(node, &msg); - return; case CEC_MSG_SET_TIMER_PROGRAM_TITLE: - if (!cec_has_record(1 << me)) - break; - return; case CEC_MSG_TIMER_CLEARED_STATUS: case CEC_MSG_TIMER_STATUS: - return; + process_tuner_record_timer_msgs(node, msg, me); + break; /* Dynamic Auto Lipsync */ diff --git a/utils/cec-follower/cec-tuner.cpp b/utils/cec-follower/cec-tuner.cpp new file mode 100644 index 000000000000..5e794d7141cb --- /dev/null +++ b/utils/cec-follower/cec-tuner.cpp @@ -0,0 +1,139 @@ +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) +/* + * Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved. + */ + +#include <sys/ioctl.h> + +#include "cec-follower.h" + +void process_tuner_record_timer_msgs(struct node *node, struct cec_msg &msg, unsigned me) +{ + switch (msg.msg[1]) { + + + /* + Tuner Control + + This is only a basic implementation. + + TODO: Device state should change when selecting services etc. + */ + + case CEC_MSG_GIVE_TUNER_DEVICE_STATUS: { + if (!cec_has_tuner(1 << me)) + break; + + struct cec_op_tuner_device_info tuner_dev_info = {}; + + cec_msg_set_reply_to(&msg, &msg); + tuner_dev_info.rec_flag = CEC_OP_REC_FLAG_NOT_USED; + tuner_dev_info.tuner_display_info = CEC_OP_TUNER_DISPLAY_INFO_NONE; + tuner_dev_info.is_analog = false; + tuner_dev_info.digital.service_id_method = CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL; + tuner_dev_info.digital.dig_bcast_system = CEC_OP_DIG_SERVICE_BCAST_SYSTEM_DVB_C; + tuner_dev_info.digital.channel.channel_number_fmt = CEC_OP_CHANNEL_NUMBER_FMT_1_PART; + tuner_dev_info.digital.channel.minor = 1; + + cec_msg_tuner_device_status(&msg, &tuner_dev_info); + transmit(node, &msg); + return; + } + + case CEC_MSG_TUNER_DEVICE_STATUS: + return; + + case CEC_MSG_SELECT_ANALOGUE_SERVICE: + case CEC_MSG_SELECT_DIGITAL_SERVICE: + case CEC_MSG_TUNER_STEP_DECREMENT: + case CEC_MSG_TUNER_STEP_INCREMENT: + if (!cec_has_tuner(1 << me)) + break; + return; + + + /* + One Touch Record + + This is only a basic implementation. + + TODO: + - If we are a TV, we should only send Record On if the + remote end is a Recording device or Reserved. Otherwise ignore. + + - Device state should reflect whether we are recording, etc. In + recording mode we should ignore Standby messages. + */ + + case CEC_MSG_RECORD_TV_SCREEN: { + if (!node->has_rec_tv) + break; + + struct cec_op_record_src rec_src = {}; + + rec_src.type = CEC_OP_RECORD_SRC_OWN; + cec_msg_set_reply_to(&msg, &msg); + cec_msg_record_on(&msg, false, &rec_src); + transmit(node, &msg); + return; + } + case CEC_MSG_RECORD_ON: + if (!cec_has_record(1 << me)) + break; + cec_msg_set_reply_to(&msg, &msg); + cec_msg_record_status(&msg, CEC_OP_RECORD_STATUS_CUR_SRC); + transmit(node, &msg); + return; + case CEC_MSG_RECORD_OFF: + if (!cec_has_record(1 << me)) + break; + cec_msg_set_reply_to(&msg, &msg); + cec_msg_record_status(&msg, CEC_OP_RECORD_STATUS_TERMINATED_OK); + transmit(node, &msg); + return; + case CEC_MSG_RECORD_STATUS: + return; + + + /* + Timer Programming + + This is only a basic implementation. + + TODO/Ideas: + - Act like an actual recording device; keep track of recording + schedule and act correctly when colliding timers are set. + - Emulate a finite storage space for recordings + */ + + case CEC_MSG_SET_ANALOGUE_TIMER: + case CEC_MSG_SET_DIGITAL_TIMER: + case CEC_MSG_SET_EXT_TIMER: + if (!cec_has_record(1 << me)) + break; + cec_msg_set_reply_to(&msg, &msg); + cec_msg_timer_status(&msg, CEC_OP_TIMER_OVERLAP_WARNING_NO_OVERLAP, + CEC_OP_MEDIA_INFO_NO_MEDIA, + CEC_OP_PROG_INFO_ENOUGH_SPACE, 0, 0, 0); + transmit(node, &msg); + return; + case CEC_MSG_CLEAR_ANALOGUE_TIMER: + case CEC_MSG_CLEAR_DIGITAL_TIMER: + case CEC_MSG_CLEAR_EXT_TIMER: + if (!cec_has_record(1 << me)) + break; + cec_msg_set_reply_to(&msg, &msg); + cec_msg_timer_cleared_status(&msg, CEC_OP_TIMER_CLR_STAT_CLEARED); + transmit(node, &msg); + return; + case CEC_MSG_SET_TIMER_PROGRAM_TITLE: + if (!cec_has_record(1 << me)) + break; + return; + case CEC_MSG_TIMER_CLEARED_STATUS: + case CEC_MSG_TIMER_STATUS: + return; + default: + break; + } +} _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
