/*****************************************************************************
- * idct.c : IDCT module
+ * idct.c : C IDCT module
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: idct.c,v 1.4 2001/01/16 05:04:25 sam 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
*****************************************************************************/
#define MODULE_NAME idct
+#include "modules_inner.h"
/*****************************************************************************
* Preamble
#include "mtime.h"
#include "tests.h"
-#include "video.h"
-#include "video_output.h"
-
-#include "video_decoder.h"
+#include "idct.h"
+#include "block_c.h"
#include "modules.h"
-#include "modules_inner.h"
-
-#include "idct.h"
+#include "modules_export.h"
/*****************************************************************************
* 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_InitIDCT ( vdec_thread_t * p_vdec);
- void vdec_SparseIDCT ( vdec_thread_t * p_vdec, dctelem_t * p_block,
- int i_sparse_pos);
-static void vdec_IDCT ( vdec_thread_t * p_vdec, dctelem_t * p_block,
- int i_idontcare );
-
-
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
MODULE_CONFIG_START
ADD_WINDOW( "Configuration for IDCT module" )
ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
-MODULE_CONFIG_END
-
-/*****************************************************************************
- * InitModule: get the module structure and configuration.
- *****************************************************************************
- * We have to fill psz_name, psz_longname and psz_version. These variables
- * will be strdup()ed later by the main application because the module can
- * be unloaded later to save memory, and we want to be able to access this
- * data even after the module has been unloaded.
- *****************************************************************************/
-int InitModule( module_t * p_module )
-{
- p_module->psz_name = MODULE_STRING;
- p_module->psz_longname = "C IDCT module";
- p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
+MODULE_INIT_START
p_module->i_capabilities = MODULE_CAPABILITY_NULL
| MODULE_CAPABILITY_IDCT;
+ p_module->psz_longname = "IDCT module";
+MODULE_INIT_STOP
- return( 0 );
-}
-
-/*****************************************************************************
- * ActivateModule: set the module to an usable state.
- *****************************************************************************
- * This function fills the capability functions and the configuration
- * structure. Once ActivateModule() has been called, the i_usage can
- * be set to 0 and calls to NeedModule() be made to increment it. To unload
- * the module, one has to wait until i_usage == 0 and call DeactivateModule().
- *****************************************************************************/
-int ActivateModule( module_t * p_module )
-{
- p_module->p_functions = malloc( sizeof( module_functions_t ) );
- if( p_module->p_functions == NULL )
- {
- return( -1 );
- }
-
+MODULE_ACTIVATE_START
idct_getfunctions( &p_module->p_functions->idct );
+MODULE_ACTIVATE_STOP
- p_module->p_config = p_config;
-
- return( 0 );
-}
-
-/*****************************************************************************
- * DeactivateModule: make sure the module can be unloaded.
- *****************************************************************************
- * This function must only be called when i_usage == 0. If it successfully
- * returns, i_usage can be set to -1 and the module unloaded. Be careful to
- * lock usage_lock during the whole process.
- *****************************************************************************/
-int DeactivateModule( module_t * p_module )
-{
- free( p_module->p_functions );
-
- return( 0 );
-}
+MODULE_DEACTIVATE_START
+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;
- p_function_list->functions.idct.pf_init = vdec_InitIDCT;
- p_function_list->functions.idct.pf_sparse_idct = vdec_SparseIDCT;
- p_function_list->functions.idct.pf_idct = vdec_IDCT;
-}
-
/*****************************************************************************
* idct_Probe: returns a preference score
*****************************************************************************/
static int idct_Probe( probedata_t *p_data )
{
- if( TestMethod( IDCT_METHOD_VAR, "idct" ) )
+ if( TestMethod( IDCT_METHOD_VAR, "idct" )
+ || TestMethod( IDCT_METHOD_VAR, "c" ))
{
return( 999 );
}
}
/*****************************************************************************
- * vdec_InitIDCT : initialize datas for vdec_SparseIDCT
+ * NormScan : Unused in this IDCT
*****************************************************************************/
-static void vdec_InitIDCT (vdec_thread_t * p_vdec)
+static void NormScan( u8 ppi_scan[2][64] )
{
- int i;
-
- dctelem_t * p_pre = p_vdec->p_pre_idct;
- memset( p_pre, 0, 64*64*sizeof(dctelem_t) );
-
- for( i=0 ; i < 64 ; i++ )
- {
- p_pre[i*64+i] = 1 << SPARSE_SCALE_FACTOR;
- vdec_IDCT( p_vdec, &p_pre[i*64], 0) ;
- }
- return;
}
/*****************************************************************************
- * vdec_IDCT : IDCT function for normal matrices
+ * IDCT : IDCT function for normal matrices
*****************************************************************************/
-static void vdec_IDCT( vdec_thread_t * p_vdec, 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;
}
}
+#include "idct_sparse.h"
+#include "idct_decl.h"
projects / vlc / blobdiff