Revision 35f97369

View differences:

configure
1891 1891
            echo "#define POWERPC_MODE_64BITS 1" >> $TMPH
1892 1892
        fi
1893 1893
        if enabled powerpc_perf; then
1894
            echo "#define POWERPC_PERFORMANCE_REPORT 1" >> $TMPH
1894
            echo "#define CONFIG_POWERPC_PERF 1" >> $TMPH
1895 1895
        fi
1896 1896
        ;;
1897 1897
    sparc64)
ffmpeg.c
3963 3963
    if(inter_matrix)
3964 3964
        av_free(inter_matrix);
3965 3965

  
3966
#ifdef POWERPC_PERFORMANCE_REPORT
3966
#ifdef CONFIG_POWERPC_PERF
3967 3967
    extern void powerpc_display_perf_report(void);
3968 3968
    powerpc_display_perf_report();
3969
#endif /* POWERPC_PERFORMANCE_REPORT */
3969
#endif /* CONFIG_POWERPC_PERF */
3970 3970

  
3971 3971
    if (received_sigterm) {
3972 3972
        fprintf(stderr,
libavcodec/ppc/dsputil_ppc.c
55 55
    return result;
56 56
}
57 57

  
58
#ifdef POWERPC_PERFORMANCE_REPORT
58
#ifdef CONFIG_POWERPC_PERF
59 59
unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total];
60 60
/* list below must match enum in dsputil_ppc.h */
61 61
static unsigned char* perfname[] = {
......
90 90
#include <stdio.h>
91 91
#endif
92 92

  
93
#ifdef POWERPC_PERFORMANCE_REPORT
93
#ifdef CONFIG_POWERPC_PERF
94 94
void powerpc_display_perf_report(void)
95 95
{
96 96
  int i, j;
......
112 112
      }
113 113
  }
114 114
}
115
#endif /* POWERPC_PERFORMANCE_REPORT */
115
#endif /* CONFIG_POWERPC_PERF */
116 116

  
117 117
/* ***** WARNING ***** WARNING ***** WARNING ***** */
118 118
/*
......
305 305
        }
306 306
        }
307 307

  
308
#ifdef POWERPC_PERFORMANCE_REPORT
308
#ifdef CONFIG_POWERPC_PERF
309 309
        {
310 310
          int i, j;
311 311
          for (i = 0 ; i < powerpc_perf_total ; i++)
......
319 319
              }
320 320
          }
321 321
        }
322
#endif /* POWERPC_PERFORMANCE_REPORT */
322
#endif /* CONFIG_POWERPC_PERF */
323 323
    }
324 324
#endif /* HAVE_ALTIVEC */
325 325
}
libavcodec/ppc/dsputil_ppc.h
21 21
#ifndef _DSPUTIL_PPC_
22 22
#define _DSPUTIL_PPC_
23 23

  
24
#ifdef POWERPC_PERFORMANCE_REPORT
24
#ifdef CONFIG_POWERPC_PERF
25 25
void powerpc_display_perf_report(void);
26 26
/* the 604* have 2, the G3* have 4, the G4s have 6,
27 27
   and the G5 are completely different (they MUST use
......
145 145
    }                             \
146 146
  }                               \
147 147
} while (0)
148
#else /* POWERPC_PERFORMANCE_REPORT */
148
#else /* CONFIG_POWERPC_PERF */
149 149
// those are needed to avoid empty statements.
150 150
#define POWERPC_PERF_DECLARE(a, cond)        int altivec_placeholder __attribute__ ((unused))
151 151
#define POWERPC_PERF_START_COUNT(a, cond)    do {} while (0)
152 152
#define POWERPC_PERF_STOP_COUNT(a, cond)     do {} while (0)
153
#endif /* POWERPC_PERFORMANCE_REPORT */
153
#endif /* CONFIG_POWERPC_PERF */
154 154

  
155 155
#endif /*  _DSPUTIL_PPC_ */
libavcodec/ppc/idct_altivec.c
171 171
POWERPC_PERF_DECLARE(altivec_idct_put_num, 1);
172 172
    vector_u8_t tmp;
173 173

  
174
#ifdef POWERPC_PERFORMANCE_REPORT
174
#ifdef CONFIG_POWERPC_PERF
175 175
POWERPC_PERF_START_COUNT(altivec_idct_put_num, 1);
176 176
#endif
177 177
    IDCT
......
202 202
    vector_u8_t perm1;
203 203
    vector_u8_t p0, p1, p;
204 204

  
205
#ifdef POWERPC_PERFORMANCE_REPORT
205
#ifdef CONFIG_POWERPC_PERF
206 206
POWERPC_PERF_START_COUNT(altivec_idct_add_num, 1);
207 207
#endif
208 208

  

Also available in: Unified diff