update ffmpeg. trying to keep local changes (see diff_to_ffmpeg_cvs.txt), let me

know if i overlooked something.
as usual, preliminary QA: tested non debug builds and several codecs including
divx3/4/5, mpeg4, xvid, msmpeg4v3, svq1, wmv7, dv (video/audio), wma
i also enabled wmv8 by default since it worked fine with the streams i have. i'm not
sure about current state of that so we might enable it only for non-x86 users in
case of trouble.

CVS patchset: 4488
CVS date: 2003/03/26 14:43:46

1 files changed, 123 insertions, 0 deletions

diff --git a/src/libffmpeg/libavcodec/ppc/dsputil_ppc.h b/src/libffmpeg/libavcodec/ppc/dsputil_ppc.h
new file mode 100644
index 000000000..ef1481a99
--- /dev/null
+++ b/src/libffmpeg/libavcodec/ppc/dsputil_ppc.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2003 Romain Dolbeau <romain@dolbeau.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _DSPUTIL_PPC_
+#define _DSPUTIL_PPC_
+
+#ifdef POWERPC_TBL_PERFORMANCE_REPORT
+void powerpc_display_perf_report(void);
+/* if you add to the enum below, also add to the perfname array
+   in dsputil_ppc.c */
+enum powerpc_perf_index {
+  altivec_fft_num = 0,
+  altivec_gmc1_num,
+  altivec_dct_unquantize_h263_num,
+  altivec_idct_add_num,
+  altivec_idct_put_num,
+  altivec_put_pixels16_num,
+  altivec_avg_pixels16_num,
+  altivec_avg_pixels8_num,
+  altivec_put_pixels8_xy2_num,
+  altivec_put_no_rnd_pixels8_xy2_num,
+  altivec_put_pixels16_xy2_num,
+  altivec_put_no_rnd_pixels16_xy2_num,
+  powerpc_clear_blocks_dcbz32,
+  powerpc_perf_total
+};
+enum powerpc_data_index {
+  powerpc_data_min = 0,
+  powerpc_data_max,
+  powerpc_data_sum,
+  powerpc_data_num,
+  powerpc_data_total
+};
+extern unsigned long long perfdata[powerpc_perf_total][powerpc_data_total];
+#ifdef POWERPC_PERF_USE_PMC
+extern unsigned long long perfdata_miss[powerpc_perf_total][powerpc_data_total];
+#endif
+
+#ifndef POWERPC_PERF_USE_PMC
+#define POWERPC_GET_CYCLES(a) asm volatile("mftb %0" : "=r" (a))
+#define POWERPC_TBL_DECLARE(a, cond) register unsigned long tbl_start, tbl_stop
+#define POWERPC_TBL_START_COUNT(a, cond) do { POWERPC_GET_CYCLES(tbl_start); } while (0)
+#define POWERPC_TBL_STOP_COUNT(a, cond) do {     \
+  POWERPC_GET_CYCLES(tbl_stop);                  \
+  if (tbl_stop > tbl_start)                      \
+  {                                              \
+    unsigned long diff =  tbl_stop - tbl_start;  \
+    if (cond)                                    \
+    {                                            \
+      if (diff < perfdata[a][powerpc_data_min])  \
+        perfdata[a][powerpc_data_min] = diff;    \
+      if (diff > perfdata[a][powerpc_data_max])  \
+        perfdata[a][powerpc_data_max] = diff;    \
+      perfdata[a][powerpc_data_sum] += diff;     \
+      perfdata[a][powerpc_data_num] ++;          \
+    }                                            \
+  }                                              \
+} while (0)
+
+#else /* POWERPC_PERF_USE_PMC */
+#define POWERPC_GET_CYCLES(a) asm volatile("mfspr %0, 937" : "=r" (a))
+#define POWERPC_GET_MISS(a) asm volatile("mfspr %0, 938" : "=r" (a))
+#define POWERPC_TBL_DECLARE(a, cond) register unsigned long cycles_start, cycles_stop, miss_start, miss_stop
+#define POWERPC_TBL_START_COUNT(a, cond) do { POWERPC_GET_MISS(miss_start); POWERPC_GET_CYCLES(cycles_start); } while (0)
+#define POWERPC_TBL_STOP_COUNT(a, cond) do {     \
+  POWERPC_GET_CYCLES(cycles_stop);               \
+  POWERPC_GET_MISS(miss_stop);                   \
+  if (cycles_stop >= cycles_start)               \
+  {                                              \
+    unsigned long diff =                         \
+                cycles_stop - cycles_start;      \
+    if (cond)                                    \
+    {                                            \
+      if (diff < perfdata[a][powerpc_data_min])  \
+        perfdata[a][powerpc_data_min] = diff;    \
+      if (diff > perfdata[a][powerpc_data_max])  \
+        perfdata[a][powerpc_data_max] = diff;    \
+      perfdata[a][powerpc_data_sum] += diff;     \
+      perfdata[a][powerpc_data_num] ++;          \
+    }                                            \
+  }                                              \
+  if (miss_stop >= miss_start)                   \
+  {                                              \
+    unsigned long diff =                         \
+                miss_stop - miss_start;          \
+    if (cond)                                    \
+    {                                            \
+      if (diff < perfdata_miss[a][powerpc_data_min]) \
+        perfdata_miss[a][powerpc_data_min] = diff;   \
+      if (diff > perfdata_miss[a][powerpc_data_max]) \
+        perfdata_miss[a][powerpc_data_max] = diff;   \
+      perfdata_miss[a][powerpc_data_sum] += diff;    \
+      perfdata_miss[a][powerpc_data_num] ++;         \
+    }                                            \
+  }                                              \
+} while (0)
+
+#endif /* POWERPC_PERF_USE_PMC */
+
+
+#else /* POWERPC_TBL_PERFORMANCE_REPORT */
+// those are needed to avoid empty statements.
+#define POWERPC_TBL_DECLARE(a, cond)        int altivec_placeholder __attribute__ ((unused))
+#define POWERPC_TBL_START_COUNT(a, cond)    do {} while (0)
+#define POWERPC_TBL_STOP_COUNT(a, cond)     do {} while (0)
+#endif /* POWERPC_TBL_PERFORMANCE_REPORT */
+
+#endif /*  _DSPUTIL_PPC_ */