mirror of https://github.com/mpv-player/mpv
removed obsolete my_profile
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10517 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
c22e181e2c
commit
c68f67e2e0
2
Makefile
2
Makefile
|
@ -22,7 +22,7 @@ SUBDIRS += libdha vidix
|
||||||
DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
|
DO_MAKE = @ for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done
|
||||||
endif
|
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_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
|
SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c parser-mpcmd.c
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,6 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "osd.h"
|
#include "osd.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
//#define ENABLE_PROFILE
|
|
||||||
#include "../my_profile.h"
|
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include "../cpudetect.h"
|
#include "../cpudetect.h"
|
||||||
#include "../mangle.h"
|
#include "../mangle.h"
|
||||||
|
|
|
@ -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)
|
#if defined(FAST_OSD) && !defined(HAVE_MMX)
|
||||||
w=w>>1;
|
w=w>>1;
|
||||||
#endif
|
#endif
|
||||||
PROFILE_START();
|
|
||||||
for(y=0;y<h;y++){
|
for(y=0;y<h;y++){
|
||||||
register int x;
|
register int x;
|
||||||
#ifdef HAVE_MMX
|
#ifdef HAVE_MMX
|
||||||
|
@ -91,7 +90,6 @@ PROFILE_START();
|
||||||
#ifdef HAVE_MMX
|
#ifdef HAVE_MMX
|
||||||
asm volatile(EMMS:::"memory");
|
asm volatile(EMMS:::"memory");
|
||||||
#endif
|
#endif
|
||||||
PROFILE_END("vo_draw_alpha_yv12");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,7 +98,6 @@ static inline void RENAME(vo_draw_alpha_yuy2)(int w,int h, unsigned char* src, u
|
||||||
#if defined(FAST_OSD) && !defined(HAVE_MMX)
|
#if defined(FAST_OSD) && !defined(HAVE_MMX)
|
||||||
w=w>>1;
|
w=w>>1;
|
||||||
#endif
|
#endif
|
||||||
PROFILE_START();
|
|
||||||
for(y=0;y<h;y++){
|
for(y=0;y<h;y++){
|
||||||
register int x;
|
register int x;
|
||||||
#ifdef HAVE_MMX
|
#ifdef HAVE_MMX
|
||||||
|
@ -160,7 +157,6 @@ PROFILE_START();
|
||||||
#ifdef HAVE_MMX
|
#ifdef HAVE_MMX
|
||||||
asm volatile(EMMS:::"memory");
|
asm volatile(EMMS:::"memory");
|
||||||
#endif
|
#endif
|
||||||
PROFILE_END("vo_draw_alpha_yuy2");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -268,7 +264,6 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
|
||||||
|
|
||||||
static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
|
static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
|
||||||
int y;
|
int y;
|
||||||
PROFILE_START();
|
|
||||||
#ifdef WORDS_BIGENDIAN
|
#ifdef WORDS_BIGENDIAN
|
||||||
dstbase++;
|
dstbase++;
|
||||||
#endif
|
#endif
|
||||||
|
@ -420,6 +415,5 @@ PROFILE_START();
|
||||||
#ifdef HAVE_MMX
|
#ifdef HAVE_MMX
|
||||||
asm volatile(EMMS:::"memory");
|
asm volatile(EMMS:::"memory");
|
||||||
#endif
|
#endif
|
||||||
PROFILE_END("vo_draw_alpha_rgb32");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
12
my_profile.c
12
my_profile.c
|
@ -1,12 +0,0 @@
|
||||||
/*
|
|
||||||
* my_profile.c
|
|
||||||
*
|
|
||||||
* Copyright (C) Nick Kurshev <nickols_k@mail.ru> - 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;
|
|
33
my_profile.h
33
my_profile.h
|
@ -1,33 +0,0 @@
|
||||||
/*
|
|
||||||
* my_profile.h
|
|
||||||
*
|
|
||||||
* Copyright (C) Nick Kurshev <nickols_k@mail.ru> - 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
|
|
Loading…
Reference in New Issue