X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Finterpolatevideo%2Fopticflow.C;h=bce991b06c6fa1fe2855ea3f0e5611b7503de698;hp=8335cc2e79855c89fb855b79e5b280daa8758d86;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=5a1b2bb96f2bd6b7ef4f8031763683726c02219d diff --git a/cinelerra-5.1/plugins/interpolatevideo/opticflow.C b/cinelerra-5.1/plugins/interpolatevideo/opticflow.C index 8335cc2e..bce991b0 100644 --- a/cinelerra-5.1/plugins/interpolatevideo/opticflow.C +++ b/cinelerra-5.1/plugins/interpolatevideo/opticflow.C @@ -1,12 +1,12 @@ /* * CINELERRA * Copyright (C) 1997-2011 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ - - + + @@ -149,11 +149,11 @@ void OpticFlowUnit::process_package(LoadPackage *package) OpticFlow::OpticFlow(InterpolateVideo *plugin, - int total_clients, + int total_clients, int total_packages) -// : LoadServer(1, +// : LoadServer(1, // total_packages) - : LoadServer(total_clients, + : LoadServer(total_clients, total_packages) { this->plugin = plugin; @@ -286,10 +286,10 @@ void WarpUnit::process_package(LoadPackage *package) int x_macroblock2 = x_macroblock + 1; int y_macroblock2 = y_macroblock + 1; - + x_macroblock2 = MIN(x_macroblock2, plugin->x_macroblocks - 1); y_macroblock2 = MIN(y_macroblock2, plugin->y_macroblocks - 1); - + float x_fraction = (float)(j - x_macroblock * macroblock_size) / macroblock_size; float y_fraction = (float)(i - y_macroblock * macroblock_size) / macroblock_size; @@ -383,9 +383,9 @@ void WarpUnit::process_package(LoadPackage *package) Warp::Warp(InterpolateVideo *plugin, - int total_clients, + int total_clients, int total_packages) - : LoadServer(total_clients, + : LoadServer(total_clients, total_packages) { this->plugin = plugin; @@ -467,9 +467,9 @@ void BlendMacroblockUnit::process_package(LoadPackage *package) BlendMacroblock::BlendMacroblock(InterpolateVideo *plugin, - int total_clients, + int total_clients, int total_packages) - : LoadServer(total_clients, + : LoadServer(total_clients, total_packages) { this->plugin = plugin;