diff --git a/Makefile b/Makefile index 98cd129316..88d70936d0 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ SUBDIRS += libdha vidix DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done endif -SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c m_config.c m_option.c parser-cfg.c m_struct.c +SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c m_config.c m_option.c parser-cfg.c m_struct.c SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c parser-mecmd.c SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c parser-mpcmd.c diff --git a/libvo/osd.c b/libvo/osd.c index da8096ac19..6c45b88c6c 100644 --- a/libvo/osd.c +++ b/libvo/osd.c @@ -8,8 +8,6 @@ #include "config.h" #include "osd.h" #include "mp_msg.h" -//#define ENABLE_PROFILE -#include "../my_profile.h" #include #include "../cpudetect.h" #include "../mangle.h" diff --git a/libvo/osd_template.c b/libvo/osd_template.c index 65cacea717..a4b2a59693 100644 --- a/libvo/osd_template.c +++ b/libvo/osd_template.c @@ -32,7 +32,6 @@ static inline void RENAME(vo_draw_alpha_yv12)(int w,int h, unsigned char* src, u #if defined(FAST_OSD) && !defined(HAVE_MMX) w=w>>1; #endif -PROFILE_START(); for(y=0;y>1; #endif -PROFILE_START(); for(y=0;y - Oct 2001 - * - * You can redistribute this file under terms and conditions - * of GNU General Public licence v2. - */ - -#include "my_profile.h" - -volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total; diff --git a/my_profile.h b/my_profile.h deleted file mode 100644 index 3a36d3a957..0000000000 --- a/my_profile.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * my_profile.h - * - * Copyright (C) Nick Kurshev - Oct 2001 - * - * You can redistribute this file under terms and conditions - * of GNU General Public licence v2. - */ -#ifndef MY_PROFILE_INC -#define MY_PROFILE_INC - -extern volatile unsigned long long int my_profile_start,my_profile_end,my_profile_total; - -#if defined ( ENABLE_PROFILE ) && defined ( ARCH_X86 ) -static inline unsigned long long int read_tsc( void ) -{ - unsigned long long int retval; - __asm __volatile ("rdtsc":"=A"(retval)::"memory"); - return retval; -} - -#define PROFILE_RESET() (my_profile_total=0ULL) -#define PROFILE_START() { static int inited=0; if(!inited) { inited=1; my_profile_total=0ULL; } my_profile_start=read_tsc(); } -#define PROFILE_END(your_message) { my_profile_end=read_tsc(); my_profile_total+=(my_profile_end-my_profile_start); printf(your_message" current=%llu total=%llu\n\t",(my_profile_end-my_profile_start),my_profile_total); } -#else -#define PROFILE_RESET() -#define PROFILE_START() -#define PROFILE_END(your_message) -#endif - - - -#endif