[FFmpeg-cvslog] r10641 - in trunk/libavcodec: Makefile ppc/mpegvideo_altivec.c ppc/mpegvideo_ppc.c

[diego]

Author: diego
Date: Tue Oct  2 14:16:33 2007
New Revision: 10641

Log:
Merge mpegvideo AltiVec code into mpegvideo_altivec.c where it belongs.


Removed:
   trunk/libavcodec/ppc/mpegvideo_ppc.c
Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/ppc/mpegvideo_altivec.c

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Tue Oct  2 14:16:33 2007
@@ -411,7 +411,6 @@ ALTIVEC-OBJS-yes                       +
                                           ppc/idct_altivec.o         \
                                           ppc/int_altivec.o          \
                                           ppc/mpegvideo_altivec.o    \
-                                          ppc/mpegvideo_ppc.o        \
 
 ALTIVEC-OBJS-$(CONFIG_H264_DECODER)    += ppc/h264_altivec.o
 ALTIVEC-OBJS-$(CONFIG_SNOW_DECODER)    += ppc/snow_altivec.o

Modified: trunk/libavcodec/ppc/mpegvideo_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/mpegvideo_altivec.c	(original)
+++ trunk/libavcodec/ppc/mpegvideo_altivec.c	Tue Oct  2 14:16:33 2007
@@ -601,3 +601,48 @@ POWERPC_PERF_START_COUNT(altivec_dct_unq
     }
 POWERPC_PERF_STOP_COUNT(altivec_dct_unquantize_h263_num, nCoeffs == 63);
 }
+
+
+extern void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block);
+extern void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
+
+void MPV_common_init_ppc(MpegEncContext *s)
+{
+    if (s->avctx->lowres==0)
+    {
+        if ((s->avctx->idct_algo == FF_IDCT_AUTO) ||
+                (s->avctx->idct_algo == FF_IDCT_ALTIVEC))
+        {
+            s->dsp.idct_put = idct_put_altivec;
+            s->dsp.idct_add = idct_add_altivec;
+            s->dsp.idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
+        }
+    }
+
+    // Test to make sure that the dct required alignments are met.
+    if ((((long)(s->q_intra_matrix) & 0x0f) != 0) ||
+        (((long)(s->q_inter_matrix) & 0x0f) != 0))
+    {
+        av_log(s->avctx, AV_LOG_INFO, "Internal Error: q-matrix blocks must be 16-byte aligned "
+                "to use AltiVec DCT. Reverting to non-AltiVec version.\n");
+        return;
+    }
+
+    if (((long)(s->intra_scantable.inverse) & 0x0f) != 0)
+    {
+        av_log(s->avctx, AV_LOG_INFO, "Internal Error: scan table blocks must be 16-byte aligned "
+                "to use AltiVec DCT. Reverting to non-AltiVec version.\n");
+        return;
+    }
+
+
+    if ((s->avctx->dct_algo == FF_DCT_AUTO) ||
+            (s->avctx->dct_algo == FF_DCT_ALTIVEC))
+    {
+#if 0 /* seems to cause trouble under some circumstances */
+        s->dct_quantize = dct_quantize_altivec;
+#endif
+        s->dct_unquantize_h263_intra = dct_unquantize_h263_altivec;
+        s->dct_unquantize_h263_inter = dct_unquantize_h263_altivec;
+    }
+}