Collapse all the 10-bit flags.

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index 2bb9e807495e32a2d316ee5287a6f25b45208dc8..a88c6f61c70034bcf1c104804852b1e5364aaeca 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -260,9 +260,9 @@ void add_outputs_and_finalize(EffectChain *chain, bool is_main_chain)
                }
 
                output_ycbcr_format.full_range = false;
-               output_ycbcr_format.num_levels = 1 << global_flags.x264_bit_depth;
+               output_ycbcr_format.num_levels = 1 << global_flags.bit_depth;
 
-               GLenum type = global_flags.x264_bit_depth > 8 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+               GLenum type = global_flags.bit_depth > 8 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
 
                chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_SPLIT_Y_AND_CBCR, type);
 
@@ -272,7 +272,7 @@ void add_outputs_and_finalize(EffectChain *chain, bool is_main_chain)
                if (global_flags.use_zerocopy) {
                        chain->add_ycbcr_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED, output_ycbcr_format, YCBCR_OUTPUT_INTERLEAVED, type);  // Add a copy where we'll only be using the Y component.
                }
-               chain->set_dither_bits(global_flags.x264_bit_depth > 8 ? 16 : 8);
+               chain->set_dither_bits(global_flags.bit_depth > 8 ? 16 : 8);
                chain->set_output_origin(OUTPUT_ORIGIN_TOP_LEFT);
        } else {
                chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
@@ -308,7 +308,7 @@ int EffectChain_add_live_input(lua_State* L)
        EffectChain *chain = (EffectChain *)luaL_checkudata(L, 1, "EffectChain");
        bool override_bounce = checkbool(L, 2);
        bool deinterlace = checkbool(L, 3);
-       bmusb::PixelFormat pixel_format = global_flags.ten_bit_input ? bmusb::PixelFormat_10BitYCbCr : bmusb::PixelFormat_8BitYCbCr;
+       bmusb::PixelFormat pixel_format = global_flags.bit_depth > 8 ? bmusb::PixelFormat_10BitYCbCr : bmusb::PixelFormat_8BitYCbCr;
 
        // Needs to be nonowned to match add_video_input (see below).
        return wrap_lua_object_nonowned<LiveInputWrapper>(L, "LiveInputWrapper", theme, chain, pixel_format, override_bounce, deinterlace, /*user_connectable=*/true);
@@ -1466,8 +1466,8 @@ int Nageru_set_audio_bus_eq_level_db(lua_State *L)
        return 0;
 }
 
-Theme::Theme(const string &filename, const vector<string> &search_dirs, ResourcePool *resource_pool, unsigned num_cards)
-       : resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
+Theme::Theme(const string &filename, const vector<string> &search_dirs, ResourcePool *resource_pool)
+       : resource_pool(resource_pool), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
        // Defaults.
        channel_names[0] = "Live";
@@ -1748,8 +1748,8 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 
        // TODO: Can we do better, e.g. by running setup_chain() and seeing what it references?
        // Actually, setup_chain does maybe hold all the references we need now anyway?
-       chain.input_frames.reserve(num_cards * FRAME_HISTORY_LENGTH);
-       for (unsigned card_index = 0; card_index < num_cards; ++card_index) {
+       chain.input_frames.reserve(MAX_VIDEO_CARDS * FRAME_HISTORY_LENGTH);
+       for (unsigned card_index = 0; card_index < MAX_VIDEO_CARDS; ++card_index) {
                for (unsigned frame_num = 0; frame_num < FRAME_HISTORY_LENGTH; ++frame_num) {
                        chain.input_frames.push_back(input_state.buffered_frames[card_index][frame_num].frame);
                }
@@ -1959,24 +1959,25 @@ int Theme::map_signal_to_card(int signal_num)
        }
 
        int card_index;
-       if (global_flags.output_card != -1 && num_cards > 1) {
+       if (global_flags.output_card != -1) {
                // Try to exclude the output card from the default card_index.
-               card_index = signal_num % (num_cards - 1);
+               card_index = signal_num % (global_flags.max_num_cards - 1);
                if (card_index >= global_flags.output_card) {
                         ++card_index;
                }
-               if (signal_num >= int(num_cards - 1)) {
+               if (signal_num >= int(global_flags.max_num_cards - 1)) {
                        print_warning(L, "Theme asked for input %d, but we only have %u input card(s) (card %d is busy with output).\n",
-                               signal_num, num_cards - 1, global_flags.output_card);
+                               signal_num, global_flags.max_num_cards - 1, global_flags.output_card);
                        fprintf(stderr, "Mapping to card %d instead.\n", card_index);
                }
        } else {
-               card_index = signal_num % num_cards;
-               if (signal_num >= int(num_cards)) {
-                       print_warning(L, "Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards);
+               card_index = signal_num % global_flags.max_num_cards;
+               if (signal_num >= int(global_flags.max_num_cards)) {
+                       print_warning(L, "Theme asked for input %d, but we only have %u card(s).\n", signal_num, global_flags.max_num_cards);
                        fprintf(stderr, "Mapping to card %d instead.\n", card_index);
                }
        }
+       global_mixer->force_card_active(card_index);
        signal_to_card_mapping[signal_num] = card_index;
        return card_index;
 }
@@ -1984,7 +1985,7 @@ int Theme::map_signal_to_card(int signal_num)
 void Theme::set_signal_mapping(int signal_num, int card_idx)
 {
        lock_guard<mutex> lock(map_m);
-       assert(card_idx < int(num_cards));
+       assert(card_idx < MAX_VIDEO_CARDS);
        signal_to_card_mapping[signal_num] = card_idx;
 }
 
@@ -2127,3 +2128,15 @@ string Theme::format_status_line(const string &disk_space_left_text, double file
        assert(lua_gettop(L) == 0);
        return text;
 }
+
+void Theme::remove_card(unsigned card_index)
+{
+       lock_guard<mutex> lock(map_m);
+       for (auto it = signal_to_card_mapping.begin(); it != signal_to_card_mapping.end(); ) {
+               if (it->second == int(card_index)) {
+                       it = signal_to_card_mapping.erase(it);
+               } else {
+                       ++it;
+               }
+       }
+}