/*****************************************************************************
* vpar_blocks.h : video parser blocks management
- * (c)1999 VideoLAN
- *****************************************************************************
*****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_blocks.h,v 1.32 2001/01/18 05:13:22 sam Exp $
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Jean-Marc Dressler <polux@via.ecp.fr>
+ * Stéphane Borel <stef@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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
* Requires:
* "config.h"
* "common.h"
* "mtime.h"
- * "vlc_thread.h"
+ * "threads.h"
* "input.h"
* "video.h"
* "video_output.h"
*****************************************************************************/
/*****************************************************************************
- * Function pointers
- *****************************************************************************/
-typedef void (*f_parse_mb_t)( struct vpar_thread_s*, int *, int, int,
- boolean_t, int, int, int, boolean_t);
-
-/*****************************************************************************
- * macroblock_t : information on a macroblock
+ * macroblock_t : information on a macroblock passed to the video_decoder
+ * thread
*****************************************************************************/
typedef struct macroblock_s
{
+ picture_t * p_picture; /* current frame in progress */
+
int i_mb_type; /* macroblock type */
int i_coded_block_pattern;
- int i_chroma_nb_blocks; /* nb of bks for a chr comp */
- picture_t * p_picture;
-
+ /* which blocks are coded ? */
+ int i_chroma_nb_blocks; /* number of blocks for
+ * chroma components */
+
/* IDCT information */
dctelem_t ppi_blocks[12][64]; /* blocks */
- f_idct_t pf_idct[12]; /* sparse IDCT or not ? */
- int pi_sparse_pos[12];
+ void ( * pf_idct[12] ) ( struct vdec_thread_s *,
+ dctelem_t*, int ); /* sparse IDCT or not ? */
+ int pi_sparse_pos[12]; /* position of the
+ * non-NULL coeff */
/* Motion compensation information */
f_motion_t pf_motion; /* function to use for motion comp */
- picture_t * p_backward;
- picture_t * p_forward;
- int ppi_field_select[2][2];
- int pppi_motion_vectors[2][2][2];
- int ppi_dmv[2][2];
+ picture_t * p_backward; /* backward reference frame */
+ picture_t * p_forward; /* forward reference frame */
+ int ppi_field_select[2][2]; /* field to use to
+ * form predictions */
+ int pppi_motion_vectors[2][2][2]; /* motion vectors */
+ int ppi_dmv[2][2]; /* differential motion vectors */
+ /* coordinates of the block in the picture */
int i_l_x, i_c_x;
int i_motion_l_y;
int i_motion_c_y;
- int i_l_stride; /* number of yuv_data_t to
+ int i_l_stride; /* number of yuv_data_t to
* ignore when changing line */
int i_c_stride; /* idem, for chroma */
boolean_t b_P_second; /* Second field of a P picture ?
} macroblock_t;
/*****************************************************************************
- * macroblock_parsing_t : parser context descriptor #3
+ * macroblock_parsing_t : macroblock context & predictors
*****************************************************************************/
typedef struct
{
- int i_motion_type, i_mv_count, i_mv_format;
- boolean_t b_dmv, b_dct_type;
-
- int i_l_x, i_l_y, i_c_x, i_c_y;
+ unsigned char i_quantizer_scale; /* scale of the quantization
+ * matrices */
+ int pi_dc_dct_pred[3]; /* ISO/IEC 13818-2 7.2.1 */
+ int pppi_pmv[2][2][2]; /* Motion vect predictors, 7.6.3 */
+ int i_motion_dir;/* Used for the next skipped macroblock */
+
+ /* Context used to optimize block parsing */
+ int i_motion_type, i_mv_count, i_mv_format;
+ boolean_t b_dmv, b_dct_type;
+
+ /* Coordinates of the upper-left pixel of the macroblock, in lum and
+ * chroma */
+ int i_l_x, i_l_y, i_c_x, i_c_y;
} macroblock_parsing_t;
/*****************************************************************************
* lookup_t : entry type for lookup tables *
*****************************************************************************/
-
typedef struct lookup_s
{
int i_value;
int i_length;
} lookup_t;
-/******************************************************************************
+/*****************************************************************************
* ac_lookup_t : special entry type for lookup tables about ac coefficients
- *****************************************************************************/
-
+ *****************************************************************************/
typedef struct dct_lookup_s
{
char i_run;
#define MB_ERROR (-1)
/* Scan */
-#define SCAN_ZIGZAG 0
-#define SCAN_ALT 1
+#define SCAN_ZIGZAG 0
+#define SCAN_ALT 1
/* Constant for block decoding */
-#define DCT_EOB 64
-#define DCT_ESCAPE 65
+#define DCT_EOB 64
+#define DCT_ESCAPE 65
/*****************************************************************************
* Constants
*****************************************************************************/
-extern int pi_default_intra_quant[];
-extern int pi_default_nonintra_quant[];
+extern u8 pi_default_intra_quant[64];
+extern u8 pi_default_nonintra_quant[64];
extern u8 pi_scan[2][64];
/*****************************************************************************
void vpar_InitBMBType( struct vpar_thread_s * p_vpar );
void vpar_InitCodedPattern( struct vpar_thread_s * p_vpar );
void vpar_InitDCTTables( struct vpar_thread_s * p_vpar );
-void vpar_PictureDataGENERIC( struct vpar_thread_s * p_vpar, int i_mb_base );
-#if (VPAR_OPTIM_LEVEL > 0)
-void vpar_PictureData2I420F0( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2P420F0( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2B420F0( struct vpar_thread_s * p_vpar, int i_mb_base );
-#endif
-#if (VPAR_OPTIM_LEVEL > 1)
-void vpar_PictureData2I420TZ( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2P420TZ( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2B420TZ( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2I420BZ( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2P420BZ( struct vpar_thread_s * p_vpar, int i_mb_base );
-void vpar_PictureData2B420BZ( struct vpar_thread_s * p_vpar, int i_mb_base );
-#endif
\ No newline at end of file
+void vpar_InitScanTable( struct vpar_thread_s * p_vpar );
+void vpar_PictureData( struct vpar_thread_s * p_vpar, int i_mb_base );