X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect_chain.cpp;h=9aaa74829041028090079ed8d511abe8e4edd2dd;hp=933553c7455f47df1f45268e1e771dc01f6dad3d;hb=c59abdb997a1d1d703ac5dd71513dea03628a53e;hpb=ad25340e74ef8553c8360d5aa3910629529a4634 diff --git a/effect_chain.cpp b/effect_chain.cpp index 933553c..9aaa748 100644 --- a/effect_chain.cpp +++ b/effect_chain.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -570,16 +571,30 @@ void EffectChain::output_dot_edge(FILE *fp, } } -unsigned EffectChain::fit_rectangle_to_aspect(unsigned width, unsigned height) +void EffectChain::size_rectangle_to_fit(unsigned width, unsigned height, unsigned *output_width, unsigned *output_height) { + unsigned scaled_width, scaled_height; + if (float(width) * aspect_denom >= float(height) * aspect_nom) { // Same aspect, or W/H > aspect (image is wider than the frame). - // In either case, keep width. - return width; + // In either case, keep width, and adjust height. + scaled_width = width; + scaled_height = lrintf(width * aspect_denom / aspect_nom); } else { // W/H < aspect (image is taller than the frame), so keep height, - // and adjust width correspondingly. - return lrintf(height * aspect_nom / aspect_denom); + // and adjust width. + scaled_width = lrintf(height * aspect_nom / aspect_denom); + scaled_height = height; + } + + // We should be consistently larger or smaller then the existing choice, + // since we have the same aspect. + assert(!(scaled_width < *output_width && scaled_height > *output_height)); + assert(!(scaled_height < *output_height && scaled_width > *output_width)); + + if (scaled_width >= *output_width && scaled_height >= *output_height) { + *output_width = scaled_width; + *output_height = scaled_height; } } @@ -651,16 +666,20 @@ void EffectChain::find_output_size(Phase *phase) return; } - // If not, look at the input phases and textures. - // We select the largest one (by fit into the current aspect). - unsigned best_width = 0; + // If all effects have the same size, use that. + unsigned output_width = 0, output_height = 0; + bool all_inputs_same_size = true; + for (unsigned i = 0; i < phase->inputs.size(); ++i) { Node *input = phase->inputs[i]; assert(input->phase->output_width != 0); assert(input->phase->output_height != 0); - unsigned width = fit_rectangle_to_aspect(input->phase->output_width, input->phase->output_height); - if (width > best_width) { - best_width = width; + if (output_width == 0 && output_height == 0) { + output_width = input->phase->output_width; + output_height = input->phase->output_height; + } else if (output_width != input->phase->output_width || + output_height != input->phase->output_height) { + all_inputs_same_size = false; } } for (unsigned i = 0; i < phase->effects.size(); ++i) { @@ -670,14 +689,45 @@ void EffectChain::find_output_size(Phase *phase) } Input *input = static_cast(effect); - unsigned width = fit_rectangle_to_aspect(input->get_width(), input->get_height()); - if (width > best_width) { - best_width = width; + if (output_width == 0 && output_height == 0) { + output_width = input->get_width(); + output_height = input->get_height(); + } else if (output_width != input->get_width() || + output_height != input->get_height()) { + all_inputs_same_size = false; } } - assert(best_width != 0); - phase->output_width = best_width; - phase->output_height = best_width * aspect_denom / aspect_nom; + + if (all_inputs_same_size) { + assert(output_width != 0); + assert(output_height != 0); + phase->output_width = output_width; + phase->output_height = output_height; + return; + } + + // If not, fit all the inputs into the current aspect, and select the largest one. + output_width = 0; + output_height = 0; + for (unsigned i = 0; i < phase->inputs.size(); ++i) { + Node *input = phase->inputs[i]; + assert(input->phase->output_width != 0); + assert(input->phase->output_height != 0); + size_rectangle_to_fit(input->phase->output_width, input->phase->output_height, &output_width, &output_height); + } + for (unsigned i = 0; i < phase->effects.size(); ++i) { + Effect *effect = phase->effects[i]->effect; + if (effect->num_inputs() != 0) { + continue; + } + + Input *input = static_cast(effect); + size_rectangle_to_fit(input->get_width(), input->get_height(), &output_width, &output_height); + } + assert(output_width != 0); + assert(output_height != 0); + phase->output_width = output_width; + phase->output_height = output_height; } void EffectChain::sort_all_nodes_topologically() @@ -946,7 +996,7 @@ void EffectChain::fix_internal_color_spaces() } // Go through each input that is not sRGB, and insert - // a colorspace conversion before it. + // a colorspace conversion after it. for (unsigned j = 0; j < node->incoming_links.size(); ++j) { Node *input = node->incoming_links[j]; assert(input->output_color_space != COLORSPACE_INVALID); @@ -957,7 +1007,8 @@ void EffectChain::fix_internal_color_spaces() CHECK(conversion->effect->set_int("source_space", input->output_color_space)); CHECK(conversion->effect->set_int("destination_space", COLORSPACE_sRGB)); conversion->output_color_space = COLORSPACE_sRGB; - insert_node_between(input, conversion, node); + replace_sender(input, conversion); + connect_nodes(input, conversion); } // Re-sort topologically, and propagate the new information. @@ -1037,7 +1088,8 @@ void EffectChain::fix_internal_alpha(unsigned step) conversion = add_node(new AlphaDivisionEffect()); } conversion->output_alpha_type = desired_type; - insert_node_between(input, conversion, node); + replace_sender(input, conversion); + connect_nodes(input, conversion); } // Re-sort topologically, and propagate the new information. @@ -1220,7 +1272,7 @@ void EffectChain::fix_internal_gamma_by_inserting_nodes(unsigned step) } // If not, go through each input that is not linear gamma, - // and insert a gamma conversion before it. + // and insert a gamma conversion after it. for (unsigned j = 0; j < node->incoming_links.size(); ++j) { Node *input = node->incoming_links[j]; assert(input->output_gamma_curve != GAMMA_INVALID); @@ -1230,7 +1282,8 @@ void EffectChain::fix_internal_gamma_by_inserting_nodes(unsigned step) Node *conversion = add_node(new GammaExpansionEffect()); CHECK(conversion->effect->set_int("source_curve", input->output_gamma_curve)); conversion->output_gamma_curve = GAMMA_LINEAR; - insert_node_between(input, conversion, node); + replace_sender(input, conversion); + connect_nodes(input, conversion); } // Re-sort topologically, and propagate the new information. @@ -1307,6 +1360,10 @@ Node *EffectChain::find_output_node() void EffectChain::finalize() { + // Save the current locale, and set it to C, so that we can output decimal + // numbers with printf and be sure to get them in the format mandated by GLSL. + char *saved_locale = setlocale(LC_NUMERIC, "C"); + // Output the graph as it is before we do any conversions on it. output_dot("step0-start.dot"); @@ -1399,6 +1456,7 @@ void EffectChain::finalize() assert(phases[0]->inputs.empty()); finalized = true; + setlocale(LC_NUMERIC, saved_locale); } void EffectChain::render_to_fbo(GLuint dest_fbo, unsigned width, unsigned height)