Originally committed as revision 7968 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -1891,7 +1891,7 @@ case "$arch" in | |||||
| echo "#define POWERPC_MODE_64BITS 1" >> $TMPH | echo "#define POWERPC_MODE_64BITS 1" >> $TMPH | ||||
| fi | fi | ||||
| if enabled powerpc_perf; then | if enabled powerpc_perf; then | ||||
| echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH | |||||
| echo "#define CONFIG_POWERPC_PERF 1" >> $TMPH | |||||
| fi | fi | ||||
| ;; | ;; | ||||
| sparc64) | sparc64) | ||||
| @@ -3963,10 +3963,10 @@ int main(int argc, char **argv) | |||||
| if(inter_matrix) | if(inter_matrix) | ||||
| av_free(inter_matrix); | av_free(inter_matrix); | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| extern void powerpc_display_perf_report(void); | extern void powerpc_display_perf_report(void); | ||||
| powerpc_display_perf_report(); | powerpc_display_perf_report(); | ||||
| #endif /* POWERPC_PERFORMANCE_REPORT */ | |||||
| #endif /* CONFIG_POWERPC_PERF */ | |||||
| if (received_sigterm) { | if (received_sigterm) { | ||||
| fprintf(stderr, | fprintf(stderr, | ||||
| @@ -55,7 +55,7 @@ int mm_support(void) | |||||
| return result; | return result; | ||||
| } | } | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; | unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; | ||||
| /* list below must match enum in dsputil_ppc.h */ | /* list below must match enum in dsputil_ppc.h */ | ||||
| static unsigned char* perfname[] = { | static unsigned char* perfname[] = { | ||||
| @@ -90,7 +90,7 @@ static unsigned char* perfname[] = { | |||||
| #include <stdio.h> | #include <stdio.h> | ||||
| #endif | #endif | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| void powerpc_display_perf_report(void) | void powerpc_display_perf_report(void) | ||||
| { | { | ||||
| int i, j; | int i, j; | ||||
| @@ -112,7 +112,7 @@ void powerpc_display_perf_report(void) | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| #endif /* POWERPC_PERFORMANCE_REPORT */ | |||||
| #endif /* CONFIG_POWERPC_PERF */ | |||||
| /* ***** WARNING ***** WARNING ***** WARNING ***** */ | /* ***** WARNING ***** WARNING ***** WARNING ***** */ | ||||
| /* | /* | ||||
| @@ -305,7 +305,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) | |||||
| } | } | ||||
| } | } | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| { | { | ||||
| int i, j; | int i, j; | ||||
| for (i = 0 ; i < powerpc_perf_total ; i++) | for (i = 0 ; i < powerpc_perf_total ; i++) | ||||
| @@ -319,7 +319,7 @@ void dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| #endif /* POWERPC_PERFORMANCE_REPORT */ | |||||
| #endif /* CONFIG_POWERPC_PERF */ | |||||
| } | } | ||||
| #endif /* HAVE_ALTIVEC */ | #endif /* HAVE_ALTIVEC */ | ||||
| } | } | ||||
| @@ -21,7 +21,7 @@ | |||||
| #ifndef _DSPUTIL_PPC_ | #ifndef _DSPUTIL_PPC_ | ||||
| #define _DSPUTIL_PPC_ | #define _DSPUTIL_PPC_ | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| void powerpc_display_perf_report(void); | void powerpc_display_perf_report(void); | ||||
| /* the 604* have 2, the G3* have 4, the G4s have 6, | /* the 604* have 2, the G3* have 4, the G4s have 6, | ||||
| and the G5 are completely different (they MUST use | and the G5 are completely different (they MUST use | ||||
| @@ -145,11 +145,11 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ | |||||
| } \ | } \ | ||||
| } \ | } \ | ||||
| } while (0) | } while (0) | ||||
| #else /* POWERPC_PERFORMANCE_REPORT */ | |||||
| #else /* CONFIG_POWERPC_PERF */ | |||||
| // those are needed to avoid empty statements. | // those are needed to avoid empty statements. | ||||
| #define POWERPC_PERF_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused)) | #define POWERPC_PERF_DECLARE(a, cond) int altivec_placeholder __attribute__ ((unused)) | ||||
| #define POWERPC_PERF_START_COUNT(a, cond) do {} while (0) | #define POWERPC_PERF_START_COUNT(a, cond) do {} while (0) | ||||
| #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) | #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) | ||||
| #endif /* POWERPC_PERFORMANCE_REPORT */ | |||||
| #endif /* CONFIG_POWERPC_PERF */ | |||||
| #endif /* _DSPUTIL_PPC_ */ | #endif /* _DSPUTIL_PPC_ */ | ||||
| @@ -171,7 +171,7 @@ void idct_put_altivec(uint8_t* dest, int stride, vector_s16_t* block) | |||||
| POWERPC_PERF_DECLARE(altivec_idct_put_num, 1); | POWERPC_PERF_DECLARE(altivec_idct_put_num, 1); | ||||
| vector_u8_t tmp; | vector_u8_t tmp; | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1); | POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1); | ||||
| #endif | #endif | ||||
| IDCT | IDCT | ||||
| @@ -202,7 +202,7 @@ POWERPC_PERF_DECLARE(altivec_idct_add_num, 1); | |||||
| vector_u8_t perm1; | vector_u8_t perm1; | ||||
| vector_u8_t p0, p1, p; | vector_u8_t p0, p1, p; | ||||
| #ifdef POWERPC_PERFORMANCE_REPORT | |||||
| #ifdef CONFIG_POWERPC_PERF | |||||
| POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1); | POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1); | ||||
| #endif | #endif | ||||