--- trunk/xvidcore/src/utils/timer.c 2002/11/26 23:44:11 677 +++ trunk/xvidcore/src/utils/timer.c 2004/03/22 22:36:25 1382 @@ -1,58 +1,25 @@ /***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Some timing functions to profile the library - - * - * NB : not thread safe and only for debug purposes. + * - Timer functions (used for internal debugging) - * * Copyright(C) 2002 Michael Militzer * - * This file is part of XviD, a free MPEG-4 video encoder/decoder - * - * XviD 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 + * 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 + * but WITHOUT ANY WARRANTY ; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Under section 8 of the GNU General Public License, the copyright - * holders of XVID explicitly forbid distribution in the following - * countries: - * - * - Japan - * - United States of America - * - * Linking XviD statically or dynamically with other modules is making a - * combined work based on XviD. Thus, the terms and conditions of the - * GNU General Public License cover the whole combination. - * - * As a special exception, the copyright holders of XviD give you - * permission to link XviD with independent modules that communicate with - * XviD solely through the VFW1.1 and DShow interfaces, regardless of the - * license terms of these independent modules, and to copy and distribute - * the resulting combined work under terms of your choice, provided that - * every copy of the combined work is accompanied by a complete copy of - * the source code of XviD (the version of XviD used to produce the - * combined work), being distributed under the terms of the GNU General - * Public License plus this exception. An independent module is a module - * which is not derived from or based on XviD. - * - * Note that people who make modified versions of XviD are not obligated - * to grant this special exception for their modified versions; it is - * their choice whether to do so. The GNU General Public License gives - * permission to release a modified version without this exception; this - * exception also makes it possible to release a modified version which - * carries forward this exception. - * - * $Id: timer.c,v 1.7 2002-11-26 23:44:11 edgomez Exp $ + * $Id: timer.c,v 1.9 2004-03-22 22:36:24 edgomez Exp $ * ****************************************************************************/ @@ -60,7 +27,7 @@ #include #include "timer.h" -#ifdef _PROFILING_ +#if defined(_PROFILING_) struct ts { @@ -86,12 +53,12 @@ double frequency = 0.0; -/* +/* determine cpu frequency not very precise but sufficient */ double -get_freq(void) +get_freq() { int64_t x, y; int32_t i; @@ -112,7 +79,7 @@ /* set everything to zero */ void -init_timer(void) +init_timer() { frequency = get_freq(); @@ -124,97 +91,97 @@ } void -start_timer(void) +start_timer() { tim.current = read_counter(); } void -start_global_timer(void) +start_global_timer() { tim.global = read_counter(); } void -stop_dct_timer(void) +stop_dct_timer() { tim.dct += (read_counter() - tim.current); } void -stop_idct_timer(void) +stop_idct_timer() { tim.idct += (read_counter() - tim.current); } void -stop_quant_timer(void) +stop_quant_timer() { tim.quant += (read_counter() - tim.current); } void -stop_iquant_timer(void) +stop_iquant_timer() { tim.iquant += (read_counter() - tim.current); } void -stop_motion_timer(void) +stop_motion_timer() { tim.motion += (read_counter() - tim.current); } void -stop_comp_timer(void) +stop_comp_timer() { tim.comp += (read_counter() - tim.current); } void -stop_edges_timer(void) +stop_edges_timer() { tim.edges += (read_counter() - tim.current); } void -stop_inter_timer(void) +stop_inter_timer() { tim.inter += (read_counter() - tim.current); } void -stop_conv_timer(void) +stop_conv_timer() { tim.conv += (read_counter() - tim.current); } void -stop_transfer_timer(void) +stop_transfer_timer() { tim.trans += (read_counter() - tim.current); } void -stop_prediction_timer(void) +stop_prediction_timer() { tim.prediction += (read_counter() - tim.current); } void -stop_coding_timer(void) +stop_coding_timer() { tim.coding += (read_counter() - tim.current); } void -stop_interlacing_timer(void) +stop_interlacing_timer() { tim.interlacing += (read_counter() - tim.current); } void -stop_global_timer(void) +stop_global_timer() { tim.overall += (read_counter() - tim.global); } @@ -223,7 +190,7 @@ write log file with some timer information */ void -write_timer(void) +write_timer() { float dct_per, quant_per, idct_per, iquant_per, mot_per, comp_per, interlacing_per; @@ -233,7 +200,7 @@ count_frames++; - /* only write log file every 50 processed frames */ + // only write log file every 50 processed frames // if (count_frames % 50) { FILE *fp;