* Altivec IDCT and motion compensation, based on Paul Mackerras's mpeg2dec

[vlc] / plugins / idct / idct.c

diff --git a/plugins/idct/idct.c b/plugins/idct/idct.c
index 2eafe3b79e08c156d6111b55064caa65333ac13b..f3e1c0b9a54952144fbb74dce46184492735968c 100644 (file)
--- a/plugins/idct/idct.c
+++ b/plugins/idct/idct.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
- * idct.c : IDCT module
+ * idct.c : C IDCT module
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: idct.c,v 1.14 2001/08/22 17:21:45 massiot Exp $
+ * $Id: idct.c,v 1.15 2001/09/05 16:07:49 massiot Exp $
  *
- * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
+ * Author: Gaël Hendryckx <jimmy@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,8 @@
 #include "mtime.h"
 #include "tests.h"
 
-#include "vdec_idct.h"
+#include "idct.h"
+#include "block_c.h"
 
 #include "modules.h"
 #include "modules_export.h"
@@ -46,8 +47,6 @@
  * Local and extern prototypes.
  *****************************************************************************/
 static void idct_getfunctions( function_list_t * p_function_list );
-static int  idct_Probe      ( probedata_t *p_data );
-static void vdec_NormScan   ( u8 ppi_scan[2][64] );
 
 /*****************************************************************************
  * Build configuration tree.
@@ -72,24 +71,6 @@ MODULE_DEACTIVATE_STOP
 
 /* Following functions are local */
 
-/*****************************************************************************
- * Functions exported as capabilities. They are declared as static so that
- * we don't pollute the namespace too much.
- *****************************************************************************/
-static void idct_getfunctions( function_list_t * p_function_list )
-{
-    p_function_list->pf_probe = idct_Probe;
-#define F p_function_list->functions.idct
-    F.pf_idct_init = _M( vdec_InitIDCT );
-    F.pf_sparse_idct = _M( vdec_SparseIDCT );
-    F.pf_idct = _M( vdec_IDCT );
-    F.pf_norm_scan = vdec_NormScan;
-    F.pf_decode_init = _M( vdec_InitDecode );
-    F.pf_addblock = _M( vdec_AddBlock );
-    F.pf_copyblock = _M( vdec_CopyBlock );
-#undef F
-}
-
 /*****************************************************************************
  * idct_Probe: returns a preference score
  *****************************************************************************/
@@ -106,17 +87,16 @@ static int idct_Probe( probedata_t *p_data )
 }
 
 /*****************************************************************************
- * vdec_NormScan : Unused in this IDCT
+ * NormScan : Unused in this IDCT
  *****************************************************************************/
-static void vdec_NormScan( u8 ppi_scan[2][64] )
+static void NormScan( u8 ppi_scan[2][64] )
 {
 }
 
 /*****************************************************************************
- * vdec_IDCT : IDCT function for normal matrices
+ * IDCT : IDCT function for normal matrices
  *****************************************************************************/
-void _M( vdec_IDCT )( void * p_unused_data, dctelem_t * p_block,
-                      int i_idontcare )
+static __inline__ void IDCT( dctelem_t * p_block )
 {
     s32 tmp0, tmp1, tmp2, tmp3;
     s32 tmp10, tmp11, tmp12, tmp13;
@@ -1294,3 +1274,5 @@ void _M( vdec_IDCT )( void * p_unused_data, dctelem_t * p_block,
     }
 }
 
+#include "idct_sparse.h"
+#include "idct_decl.h"