Collapse all the 10-bit flags.

[nageru] / nageru / mixer.cpp

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 6a2909f6475d5f78f7baa39a4000d2e26832bd4c..9d3b12cfd90d4bbad29f1d1bae3f54b2446a5fb6 100644 (file)
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -124,7 +124,7 @@ void ensure_texture_resolution(PBOFrameAllocator::Userdata *userdata, unsigned f
                cbcr_width != userdata->last_cbcr_width[field] ||
                cbcr_height != userdata->last_cbcr_height[field];
        const bool recreate_v210_texture =
-               global_flags.ten_bit_input &&
+               global_flags.bit_depth > 8 &&
                (first || v210_width != userdata->last_v210_width[field] || height != userdata->last_height[field]);
 
        if (recreate_main_texture) {
@@ -364,7 +364,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
                ycbcr_format.luma_coefficients = YCBCR_REC_601;
        }
        ycbcr_format.full_range = false;
-       ycbcr_format.num_levels = 1 << global_flags.x264_bit_depth;
+       ycbcr_format.num_levels = 1 << global_flags.bit_depth;
        ycbcr_format.cb_x_position = 0.0f;
        ycbcr_format.cr_x_position = 0.0f;
        ycbcr_format.cb_y_position = 0.5f;
@@ -378,7 +378,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
        // Display chain; shows the live output produced by the main chain (or rather, a copy of it).
        display_chain.reset(new EffectChain(global_flags.width, global_flags.height, resource_pool.get()));
        check_error();
-       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;
        display_input = new YCbCrInput(inout_format, ycbcr_format, global_flags.width, global_flags.height, YCBCR_INPUT_SPLIT_Y_AND_CBCR, type);
        display_chain->add_input(display_input);
        display_chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
@@ -511,7 +511,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
 
        chroma_subsampler.reset(new ChromaSubsampler(resource_pool.get()));
 
-       if (global_flags.ten_bit_input) {
+       if (global_flags.bit_depth > 8) {
                if (!v210Converter::has_hardware_support()) {
                        fprintf(stderr, "ERROR: --ten-bit-input requires support for OpenGL compute shaders\n");
                        fprintf(stderr, "       (OpenGL 4.3, or GL_ARB_compute_shader + GL_ARB_shader_image_load_store).\n");
@@ -528,7 +528,7 @@ Mixer::Mixer(const QSurfaceFormat &format)
                v210_converter->precompile_shader(3840);
                v210_converter->precompile_shader(4096);
        }
-       if (global_flags.ten_bit_output) {
+       if (global_flags.bit_depth > 8) {
                if (!v210Converter::has_hardware_support()) {
                        fprintf(stderr, "ERROR: --ten-bit-output requires support for OpenGL compute shaders\n");
                        fprintf(stderr, "       (OpenGL 4.3, or GL_ARB_compute_shader + GL_ARB_shader_image_load_store).\n");
@@ -609,7 +609,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardT
                pixel_format = capture->get_current_pixel_format();
        } else if (card_type == CardType::CEF_INPUT) {
                pixel_format = PixelFormat_8BitBGRA;
-       } else if (global_flags.ten_bit_input) {
+       } else if (global_flags.bit_depth > 8) {
                pixel_format = PixelFormat_10BitYCbCr;
        } else {
                pixel_format = PixelFormat_8BitYCbCr;
@@ -1821,7 +1821,7 @@ void Mixer::render_one_frame(int64_t duration)
        output_ycbcr_format.chroma_subsampling_y = 1;
        output_ycbcr_format.luma_coefficients = ycbcr_output_coefficients;
        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;
        chain->change_ycbcr_output_format(output_ycbcr_format);
 
        // Render main chain. If we're using zerocopy Quick Sync encoding
@@ -1834,8 +1834,8 @@ void Mixer::render_one_frame(int64_t duration)
        GLuint y_tex, cbcr_full_tex, cbcr_tex;
        GLuint y_copy_tex, cbcr_copy_tex = 0;
        GLuint y_display_tex, cbcr_display_tex;
-       GLenum y_type = (global_flags.x264_bit_depth > 8) ? GL_R16 : GL_R8;
-       GLenum cbcr_type = (global_flags.x264_bit_depth > 8) ? GL_RG16 : GL_RG8;
+       GLenum y_type = (global_flags.bit_depth > 8) ? GL_R16 : GL_R8;
+       GLenum cbcr_type = (global_flags.bit_depth > 8) ? GL_RG16 : GL_RG8;
        const bool is_zerocopy = video_encoder->is_zerocopy();
        if (is_zerocopy) {
                cbcr_full_tex = resource_pool->create_2d_texture(cbcr_type, global_flags.width, global_flags.height);