From c6c5e2ca4ea51426e32608f8b8e2cbcd5f1ab74f Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 22 Apr 2018 23:00:52 +0200 Subject: [PATCH] Make the right-click menu legal on signals connected to FFmpeg cards. --- audio_mixer.cpp | 13 ++- glwidget.cpp | 213 +++++++++++++++++++++++++----------------------- mixer.cpp | 2 +- mixer.h | 5 ++ theme.lua | 8 +- 5 files changed, 131 insertions(+), 110 deletions(-) diff --git a/audio_mixer.cpp b/audio_mixer.cpp index d2617f6..e7d545f 100644 --- a/audio_mixer.cpp +++ b/audio_mixer.cpp @@ -953,11 +953,15 @@ void AudioMixer::serialize_device(DeviceSpec device_spec, DeviceSpecProto *devic void AudioMixer::set_simple_input(unsigned card_index) { + assert(card_index < num_capture_cards + num_ffmpeg_inputs); InputMapping new_input_mapping; InputMapping::Bus input; input.name = "Main"; - input.device.type = InputSourceType::CAPTURE_CARD; - input.device.index = card_index; + if (card_index >= num_capture_cards) { + input.device = DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_capture_cards}; + } else { + input.device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index}; + } input.source_channel[0] = 0; input.source_channel[1] = 1; @@ -977,6 +981,11 @@ unsigned AudioMixer::get_simple_input() const input_mapping.buses[0].source_channel[0] == 0 && input_mapping.buses[0].source_channel[1] == 1) { return input_mapping.buses[0].device.index; + } else if (input_mapping.buses.size() == 1 && + input_mapping.buses[0].device.type == InputSourceType::FFMPEG_VIDEO_INPUT && + input_mapping.buses[0].source_channel[0] == 0 && + input_mapping.buses[0].source_channel[1] == 1) { + return input_mapping.buses[0].device.index + num_capture_cards; } else { return numeric_limits::max(); } diff --git a/glwidget.cpp b/glwidget.cpp index 307e3e4..7caee37 100644 --- a/glwidget.cpp +++ b/glwidget.cpp @@ -177,135 +177,140 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos) unsigned num_cards = global_mixer->get_num_cards(); unsigned current_card = global_mixer->map_signal(signal_num); - for (unsigned card_index = 0; card_index < num_cards; ++card_index) { - QString description(QString::fromStdString(global_mixer->get_card_description(card_index))); - QAction *action = new QAction(description, &card_group); - action->setCheckable(true); - if (current_card == card_index) { - action->setChecked(true); + bool is_ffmpeg = global_mixer->card_is_ffmpeg(current_card); + + if (!is_ffmpeg) { // FFmpeg inputs are not connected to any card; they're locked to a given input and have a given Y'CbCr interpretatio and have a given Y'CbCr interpretationn. + for (unsigned card_index = 0; card_index < num_cards; ++card_index) { + QString description(QString::fromStdString(global_mixer->get_card_description(card_index))); + QAction *action = new QAction(description, &card_group); + action->setCheckable(true); + if (current_card == card_index) { + action->setChecked(true); + } + action->setData(QList{"card", card_index}); + card_submenu.addAction(action); } - action->setData(QList{"card", card_index}); - card_submenu.addAction(action); - } - card_submenu.setTitle("Input source"); - menu.addMenu(&card_submenu); + card_submenu.setTitle("Input source"); + menu.addMenu(&card_submenu); - // Note that this setting depends on which card is active. - // TODO: Consider hiding this for BGRA sources. + // Note that this setting depends on which card is active. - QMenu interpretation_submenu; - QActionGroup interpretation_group(&interpretation_submenu); + QMenu interpretation_submenu; + QActionGroup interpretation_group(&interpretation_submenu); - YCbCrInterpretation current_interpretation = global_mixer->get_input_ycbcr_interpretation(current_card); - { - QAction *action = new QAction("Auto", &interpretation_group); - action->setCheckable(true); - if (current_interpretation.ycbcr_coefficients_auto) { - action->setChecked(true); - } - action->setData(QList{"interpretation", true, YCBCR_REC_709, false}); - interpretation_submenu.addAction(action); - } - for (YCbCrLumaCoefficients ycbcr_coefficients : { YCBCR_REC_709, YCBCR_REC_601 }) { - for (bool full_range : { false, true }) { - std::string description; - if (ycbcr_coefficients == YCBCR_REC_709) { - description = "Rec. 709 (HD)"; - } else { - description = "Rec. 601 (SD)"; - } - if (full_range) { - description += ", full range (nonstandard)"; - } - QAction *action = new QAction(QString::fromStdString(description), &interpretation_group); + YCbCrInterpretation current_interpretation = global_mixer->get_input_ycbcr_interpretation(current_card); + { + QAction *action = new QAction("Auto", &interpretation_group); action->setCheckable(true); - if (!current_interpretation.ycbcr_coefficients_auto && - ycbcr_coefficients == current_interpretation.ycbcr_coefficients && - full_range == current_interpretation.full_range) { + if (current_interpretation.ycbcr_coefficients_auto) { action->setChecked(true); } - action->setData(QList{"interpretation", false, ycbcr_coefficients, full_range}); + action->setData(QList{"interpretation", true, YCBCR_REC_709, false}); interpretation_submenu.addAction(action); } - } + for (YCbCrLumaCoefficients ycbcr_coefficients : { YCBCR_REC_709, YCBCR_REC_601 }) { + for (bool full_range : { false, true }) { + std::string description; + if (ycbcr_coefficients == YCBCR_REC_709) { + description = "Rec. 709 (HD)"; + } else { + description = "Rec. 601 (SD)"; + } + if (full_range) { + description += ", full range (nonstandard)"; + } + QAction *action = new QAction(QString::fromStdString(description), &interpretation_group); + action->setCheckable(true); + if (!current_interpretation.ycbcr_coefficients_auto && + ycbcr_coefficients == current_interpretation.ycbcr_coefficients && + full_range == current_interpretation.full_range) { + action->setChecked(true); + } + action->setData(QList{"interpretation", false, ycbcr_coefficients, full_range}); + interpretation_submenu.addAction(action); + } + } - interpretation_submenu.setTitle("Input interpretation"); - menu.addMenu(&interpretation_submenu); + interpretation_submenu.setTitle("Input interpretation"); + menu.addMenu(&interpretation_submenu); + } // --- The choices in the next few options depend a lot on which card is active --- - // Add a submenu for selecting video input, with an action for each input. - QMenu video_input_submenu; - QActionGroup video_input_group(&video_input_submenu); - std::map video_inputs = global_mixer->get_available_video_inputs(current_card); - uint32_t current_video_input = global_mixer->get_current_video_input(current_card); - for (const auto &mode : video_inputs) { - QString description(QString::fromStdString(mode.second)); - QAction *action = new QAction(description, &video_input_group); - action->setCheckable(true); - if (mode.first == current_video_input) { - action->setChecked(true); + bool has_auto_mode = false; + if (!is_ffmpeg) { + // Add a submenu for selecting video input, with an action for each input. + QMenu video_input_submenu; + QActionGroup video_input_group(&video_input_submenu); + std::map video_inputs = global_mixer->get_available_video_inputs(current_card); + uint32_t current_video_input = global_mixer->get_current_video_input(current_card); + for (const auto &mode : video_inputs) { + QString description(QString::fromStdString(mode.second)); + QAction *action = new QAction(description, &video_input_group); + action->setCheckable(true); + if (mode.first == current_video_input) { + action->setChecked(true); + } + action->setData(QList{"video_input", mode.first}); + video_input_submenu.addAction(action); } - action->setData(QList{"video_input", mode.first}); - video_input_submenu.addAction(action); - } - video_input_submenu.setTitle("Video input"); - menu.addMenu(&video_input_submenu); - - // The same for audio input. - QMenu audio_input_submenu; - QActionGroup audio_input_group(&audio_input_submenu); - std::map audio_inputs = global_mixer->get_available_audio_inputs(current_card); - uint32_t current_audio_input = global_mixer->get_current_audio_input(current_card); - for (const auto &mode : audio_inputs) { - QString description(QString::fromStdString(mode.second)); - QAction *action = new QAction(description, &audio_input_group); - action->setCheckable(true); - if (mode.first == current_audio_input) { - action->setChecked(true); + video_input_submenu.setTitle("Video input"); + menu.addMenu(&video_input_submenu); + + // The same for audio input. + QMenu audio_input_submenu; + QActionGroup audio_input_group(&audio_input_submenu); + std::map audio_inputs = global_mixer->get_available_audio_inputs(current_card); + uint32_t current_audio_input = global_mixer->get_current_audio_input(current_card); + for (const auto &mode : audio_inputs) { + QString description(QString::fromStdString(mode.second)); + QAction *action = new QAction(description, &audio_input_group); + action->setCheckable(true); + if (mode.first == current_audio_input) { + action->setChecked(true); + } + action->setData(QList{"audio_input", mode.first}); + audio_input_submenu.addAction(action); } - action->setData(QList{"audio_input", mode.first}); - audio_input_submenu.addAction(action); - } - audio_input_submenu.setTitle("Audio input"); - menu.addMenu(&audio_input_submenu); + audio_input_submenu.setTitle("Audio input"); + menu.addMenu(&audio_input_submenu); + + // The same for resolution. + QMenu mode_submenu; + QActionGroup mode_group(&mode_submenu); + std::map video_modes = global_mixer->get_available_video_modes(current_card); + uint32_t current_video_mode = global_mixer->get_current_video_mode(current_card); + for (const auto &mode : video_modes) { + QString description(QString::fromStdString(mode.second.name)); + QAction *action = new QAction(description, &mode_group); + action->setCheckable(true); + if (mode.first == current_video_mode) { + action->setChecked(true); + } + action->setData(QList{"video_mode", mode.first}); + mode_submenu.addAction(action); - // The same for resolution. - QMenu mode_submenu; - QActionGroup mode_group(&mode_submenu); - std::map video_modes = global_mixer->get_available_video_modes(current_card); - uint32_t current_video_mode = global_mixer->get_current_video_mode(current_card); - bool has_auto_mode = false; - for (const auto &mode : video_modes) { - QString description(QString::fromStdString(mode.second.name)); - QAction *action = new QAction(description, &mode_group); - action->setCheckable(true); - if (mode.first == current_video_mode) { - action->setChecked(true); + // TODO: Relying on the 0 value here (from bmusb.h) is ugly, it should be a named constant. + if (mode.first == 0) { + has_auto_mode = true; + } } - action->setData(QList{"video_mode", mode.first}); - mode_submenu.addAction(action); - // TODO: Relying on the 0 value here (from bmusb.h) is ugly, it should be a named constant. - if (mode.first == 0) { - has_auto_mode = true; + // Add a “scan” menu if there's no “auto” mode. + if (!has_auto_mode) { + QAction *action = new QAction("Scan", &mode_group); + action->setData(QList{"video_mode", 0}); + mode_submenu.addSeparator(); + mode_submenu.addAction(action); } - } - // Add a “scan” menu if there's no “auto” mode. - if (!has_auto_mode) { - QAction *action = new QAction("Scan", &mode_group); - action->setData(QList{"video_mode", 0}); - mode_submenu.addSeparator(); - mode_submenu.addAction(action); + mode_submenu.setTitle("Input mode"); + menu.addMenu(&mode_submenu); } - mode_submenu.setTitle("Input mode"); - menu.addMenu(&mode_submenu); - // --- End of card-dependent choices --- // Add an audio source selector. diff --git a/mixer.cpp b/mixer.cpp index 2365810..73a59d5 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -1018,7 +1018,7 @@ void Mixer::thread_func() } else { master_card_is_output = false; master_card_index = theme->map_signal(master_clock_channel); - assert(master_card_index < num_cards); + assert(master_card_index < num_cards + num_video_inputs); } OutputFrameInfo output_frame_info = get_one_frame_from_each_card(master_card_index, master_card_is_output, new_frames, has_new_frame); diff --git a/mixer.h b/mixer.h index d8a9c8b..03a5163 100644 --- a/mixer.h +++ b/mixer.h @@ -322,6 +322,11 @@ public: return cards[card_index].output != nullptr; } + bool card_is_ffmpeg(unsigned card_index) const { + assert(card_index < num_cards + num_video_inputs); + return cards[card_index].type == CardType::FFMPEG_INPUT; + } + std::map get_available_video_modes(unsigned card_index) const { assert(card_index < num_cards); return cards[card_index].capture->get_available_video_modes(); diff --git a/theme.lua b/theme.lua index 77a1ff1..0f3ce72 100644 --- a/theme.lua +++ b/theme.lua @@ -323,9 +323,11 @@ end -- API ENTRY POINT -- Returns, given a channel number, which signal it corresponds to (starting from 0). --- Should return -1 if the channel does not correspond to a simple signal. --- (The information is used for whether right-click on the channel should bring up --- an input selector or not.) +-- Should return -1 if the channel does not correspond to a simple signal +-- (one connected to a capture card, or a video input). The information is used for +-- whether right-click on the channel should bring up a context menu or not, +-- typically containing an input selector, resolution menu etc. +-- -- Called once for each channel, at the start of the program. -- Will never be called for live (0) or preview (1). function channel_signal(channel) -- 2.39.2