#include "vpar_synchro.h"
#include "video_parser.h"
-/*
- * Local prototypes
- */
+/*****************************************************************************
+ * vdec_MotionComponent : last stage of motion compensation
+ *****************************************************************************/
+static void __inline__ MotionComponent( yuv_data_t * p_src, yuv_data_t * p_dest,
+ int i_width, int i_height, int i_x_step,
+ int i_select )
+{
+ int i_x, i_y, i_x1, i_y1;
+ unsigned int i_dummy;
+
+ switch( i_select )
+ {
+ case 4:
+ /* !xh, !yh, average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ i_dummy = p_dest[i_x + i_x1] + p_src[i_x + i_x1];
+ p_dest[i_x + i_x1] = (i_dummy + 1) >> 1;
+ }
+ }
+ p_dest += i_x_step;
+ p_src += i_x_step;
+ }
+ }
+ break;
+
+ case 0:
+ /* !xh, !yh, !average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ memcpy( &p_dest[i_x], &p_src[i_x], 8 * sizeof(yuv_data_t) );
+ }
+ p_dest += i_x_step;
+ p_src += i_x_step;
+ }
+ }
+ break;
+
+ case 6:
+ /* !xh, yh, average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ i_dummy = p_dest[i_x+i_x1]
+ + ((unsigned int)(p_src[i_x+i_x1] + 1
+ + p_src[i_x+i_x1 + i_x_step]) >> 1);
+ p_dest[i_x + i_x1] = (i_dummy + 1) >> 1;
+ }
+ }
+ p_dest += i_x_step;
+ p_src += i_x_step;
+ }
+ }
+ break;
+
+ case 2:
+ /* !xh, yh, !average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ p_dest[i_x+i_x1] = (unsigned int)(p_src[i_x+i_x1] + 1
+ + p_src[i_x+i_x1 + i_x_step])
+ >> 1;
+ }
+ }
+ }
+ }
+ break;
+
+ case 5:
+ /* xh, !yh, average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ i_dummy = p_dest[i_x+i_x1]
+ + ((unsigned int)(p_src[i_x+i_x1]
+ + p_src[i_x+i_x1 + 1] + 1) >> 1);
+ p_dest[i_x + i_x1] = (i_dummy + 1) >> 1;
+ }
+ }
+ p_dest += i_x_step;
+ p_src += i_x_step;
+ }
+ }
+ break;
+
+ case 1:
+ /* xh, !yh, !average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ p_dest[i_x+i_x1] = (unsigned int)(p_src[i_x+i_x1]
+ + p_src[i_x+i_x1 + 1] + 1)
+ >> 1;
+ }
+ }
+ }
+ }
+ break;
+
+ case 7:
+ /* xh, yh, average */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ i_dummy = p_dest[i_x+i_x1]
+ + ((unsigned int)(
+ p_src[i_x+i_x1]
+ + p_src[i_x+i_x1 + 1]
+ + p_src[i_x+i_x1 + i_x_step]
+ + p_src[i_x+i_x1 + i_x_step + 1]
+ + 2) >> 2);
+ p_dest[i_x + i_x1] = (i_dummy + 1) >> 1;
+ }
+ }
+ p_dest += i_x_step;
+ p_src += i_x_step;
+ }
+ }
+ break;
+
+ default:
+ /* xh, yh, !average (3) */
+ for( i_y = 0; i_y < i_height; i_y += 4 )
+ {
+ for( i_y1 = 0; i_y1 < 4; i_y1++ )
+ {
+ for( i_x = 0; i_x < i_width; i_x += 8 )
+ {
+ for( i_x1 = 0; i_x1 < 8; i_x1++ )
+ {
+ p_dest[i_x+i_x1]
+ = ((unsigned int)(
+ p_src[i_x+i_x1]
+ + p_src[i_x+i_x1 + 1]
+ + p_src[i_x+i_x1 + i_x_step]
+ + p_src[i_x+i_x1 + i_x_step + 1]
+ + 2) >> 2);
+ }
+ }
+ p_dest += i_x_step;
+ p_src += i_x_step;
+ }
+ }
+ break;
+
+ }
+}
+
typedef struct motion_arg_s
{
picture_t * p_source;
boolean_t b_source_field;
boolean_t b_dest_field;
- int i_height;
- int i_x_step;
+ int i_height, i_offset;
int i_mv_x, i_mv_y;
boolean_t b_average;
} motion_arg_t;
-/*
-typedef void (*f_motion_c_t)( coeff_t *, pel_lookup_table_t *,
- int, coeff_t *, int, int,
- int, int, int, int, int );
-*/
-
/*****************************************************************************
- * vdec_MotionComponent : last stage of motion compensation
+ * vdec_MotionDummy : motion compensation for an intra macroblock
*****************************************************************************/
-static __inline__ vdec_MotionComponent()
-{
-
-}
-
-/*****************************************************************************
- * vdec_DummyRecon : motion compensation for an intra macroblock
- *****************************************************************************/
-void vdec_DummyRecon( macroblock_t * p_mb )
+void vdec_MotionDummy( macroblock_t * p_mb )
{
/* Nothing to do :) */
}
/*****************************************************************************
- * vdec_FieldFieldRecon : motion compensation for field motion type (field)
+ * vdec_MotionFieldField : motion compensation for field motion type (field)
*****************************************************************************/
-void vdec_FieldFieldRecon( macroblock_t * p_mb )
+void vdec_MotionFieldField( macroblock_t * p_mb )
{
-#if 0
- motion_arg_t motion_arg;
+ motion_arg_t args;
+
+ args.i_height = 16;
+ args.b_average = 0;
+ args.b_dest_field = 0;
+ args.i_offset = 0;
- motion_arg
-
if( p_mb->i_mb_type & MB_MOTION_FORWARD )
{
- int i_current_field;
- picture_t * p_pred_frame;
+ boolean_t b_current_field;
- i_current_field = ( p_mb->i_structure == BOTTOM_FIELD );
- if( p_mb->b_P_coding_type && (p_mb->i_current_structure == FRAME_STRUCTURE)
- && (i_current_field != p_mb->ppi_field_select[0][0]) )
- {
- p_pred_frame = p_mb->p_forward;
- }
+ b_current_field = ( p_mb->i_structure == BOTTOM_FIELD );
+ if( p_mb->b_P_coding_type
+ && (p_mb->i_current_structure == FRAME_STRUCTURE)
+ && (b_current_field != p_mb->ppi_field_select[0][0]) )
+ args.p_source = p_mb->p_picture;
else
- {
- p_pred_frame = p_mb->p_backward;
- }
- p_mb->pf_chroma_motion( p_mb, p_pred_frame, 0 /* average */ );
+ args.p_source = p_mb->p_forward;
+ args.b_source_field = p_mb->ppi_field_select[0][0];
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][0][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][0][1];
+ p_mb->pf_chroma_motion( p_mb, &args );
+
+ args.b_average = 1;
+ }
+
+ if( p_mb->i_mb_type & MB_MOTION_BACKWARD )
+ {
+ args.b_source_field = p_mb->ppi_field_select[0][1];
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][1][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][1][1];
+ p_mb->pf_chroma_motion( p_mb, &args );
}
-#endif
}
/*****************************************************************************
- * vdec_Field16x8Recon : motion compensation for 16x8 motion type (field)
+ * vdec_MotionField16x8 : motion compensation for 16x8 motion type (field)
*****************************************************************************/
-void vdec_Field16x8Recon( macroblock_t * p_mb )
+void vdec_MotionField16x8( macroblock_t * p_mb )
{
+ motion_arg_t args;
+
+ args.i_height = 8;
+ args.b_average = 0;
+ args.b_dest_field = 0;
+ args.i_offset = 0;
+
+ if( p_mb->i_mb_type & MB_MOTION_FORWARD )
+ {
+ boolean_t b_current_field;
+
+ b_current_field = ( p_mb->i_structure == BOTTOM_FIELD );
+ if( p_mb->b_P_coding_type
+ && (p_mb->i_current_structure == FRAME_STRUCTURE)
+ && (b_current_field != p_mb->ppi_field_select[0][0]) )
+ args.p_source = p_mb->p_picture;
+ else
+ args.p_source = p_mb->p_forward;
+ args.b_source_field = p_mb->ppi_field_select[0][0];
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][0][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][0][1];
+ p_mb->pf_chroma_motion( p_mb, &args );
+
+ if( p_mb->b_P_coding_type
+ && (p_mb->i_current_structure == FRAME_STRUCTURE)
+ && (b_current_field != p_mb->ppi_field_select[1][0]) )
+ args.p_source = p_mb->p_picture;
+ else
+ args.p_source = p_mb->p_forward;
+ args.b_source_field = p_mb->ppi_field_select[1][0];
+ args.i_mv_x = p_mb->pppi_motion_vectors[1][0][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[1][0][1];
+ args.i_offset = 8;
+ p_mb->pf_chroma_motion( p_mb, &args );
+
+ args.b_average = 1;
+ args.i_offset = 0;
+ }
+ if( p_mb->i_mb_type & MB_MOTION_BACKWARD )
+ {
+ args.p_source = p_mb->p_backward;
+ args.b_source_field = p_mb->ppi_field_select[0][1];
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][1][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][1][1];
+ p_mb->pf_chroma_motion( p_mb, &args );
+
+ args.b_source_field = p_mb->ppi_field_select[1][1];
+ args.i_mv_x = p_mb->pppi_motion_vectors[1][1][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[1][1][1];
+ args.i_offset = 8;
+ p_mb->pf_chroma_motion( p_mb, &args );
+ }
}
/*****************************************************************************
- * vdec_FieldDMVRecon : motion compensation for dmv motion type (field)
+ * vdec_MotionFieldDMV : motion compensation for dmv motion type (field)
*****************************************************************************/
-void vdec_FieldDMVRecon( macroblock_t * p_mb )
+void vdec_MotionFieldDMV( macroblock_t * p_mb )
{
/* This is necessarily a MOTION_FORWARD only macroblock */
-
+ fprintf(stderr, "DMV pas code !!!\n");
}
/*****************************************************************************
- * vdec_FrameFrameRecon : motion compensation for frame motion type (frame)
+ * vdec_MotionFrameFrame : motion compensation for frame motion type (frame)
*****************************************************************************/
-void vdec_FrameFrameRecon( macroblock_t * p_mb )
+void vdec_MotionFrameFrame( macroblock_t * p_mb )
{
+ motion_arg_t args;
-}
+ args.b_source_field = args.b_dest_field = 0;
+ args.i_height = 16;
+ args.b_average = 0;
+ args.i_offset = 0;
-/*****************************************************************************
- * vdec_FrameFieldRecon : motion compensation for field motion type (frame)
- *****************************************************************************/
-void vdec_FrameFieldRecon( macroblock_t * p_mb )
-{
+ if( p_mb->i_mb_type & MB_MOTION_FORWARD )
+ {
+ args.p_source = p_mb->p_forward;
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][0][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][0][1];
+ p_mb->pf_chroma_motion( p_mb, &args );
-}
+ args.b_average = 1;
+ }
-/*****************************************************************************
- * vdec_FrameDMVRecon : motion compensation for dmv motion type (frame)
- *****************************************************************************/
-void vdec_FrameDMVRecon( macroblock_t * p_mb )
-{
- /* This is necessarily a MOTION_FORWARD only macroblock */
-
+ if( p_mb->i_mb_type & MB_MOTION_BACKWARD )
+ {
+ /* Necessarily MB_MOTION_BACKWARD */
+ args.p_source = p_mb->p_backward;
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][1][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][1][1];
+ p_mb->pf_chroma_motion( p_mb, &args );
+ }
}
/*****************************************************************************
- * vdec_MotionField : motion compensation for skipped macroblocks (field)
+ * vdec_MotionFrameField : motion compensation for field motion type (frame)
*****************************************************************************/
-void vdec_MotionField( macroblock_t * p_mb )
+void vdec_MotionFrameField( macroblock_t * p_mb )
{
+ motion_arg_t args;
-}
+ args.i_height = 8;
+ args.b_average = 0;
+ args.i_offset = 0;
-/*****************************************************************************
- * vdec_MotionFrame : motion compensation for skipped macroblocks (frame)
- *****************************************************************************/
-void vdec_MotionFrame( macroblock_t * p_mb )
-{
+ if( p_mb->i_mb_type & MB_MOTION_FORWARD )
+ {
+ args.p_source = p_mb->p_forward;
-}
+ args.b_source_field = p_mb->ppi_field_select[0][0];
+ args.b_dest_field = 0;
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][0][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][0][1] >> 1;
+ p_mb->pf_chroma_motion( p_mb, &args );
-/*****************************************************************************
- * vdec_Motion420 : motion compensation for a 4:2:0 macroblock
- *****************************************************************************/
-void vdec_Motion420( macroblock_t * p_mb )
-{
-}
+ args.b_source_field = p_mb->ppi_field_select[1][0];
+ args.b_dest_field = 1;
+ args.i_mv_x = p_mb->pppi_motion_vectors[1][0][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[1][0][1] >> 1;
+ p_mb->pf_chroma_motion( p_mb, &args );
-/*****************************************************************************
- * vdec_Motion422 : motion compensation for a 4:2:2 macroblock
- *****************************************************************************/
-void vdec_Motion422( macroblock_t * p_mb )
-{
+ args.b_average = 1;
+ }
+
+ if( p_mb->i_mb_type & MB_MOTION_BACKWARD )
+ {
+ args.p_source = p_mb->p_backward;
+
+ args.b_source_field = p_mb->ppi_field_select[0][1];
+ args.b_dest_field = 0;
+ args.i_mv_x = p_mb->pppi_motion_vectors[0][1][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[0][1][1] >> 1;
+ p_mb->pf_chroma_motion( p_mb, &args );
+
+ args.b_source_field = p_mb->ppi_field_select[1][1];
+ args.b_dest_field = 1;
+ args.i_mv_x = p_mb->pppi_motion_vectors[1][1][0];
+ args.i_mv_y = p_mb->pppi_motion_vectors[1][1][1] >> 1;
+ p_mb->pf_chroma_motion( p_mb, &args );
+ }
}
/*****************************************************************************
- * vdec_Motion444 : motion compensation for a 4:4:4 macroblock
+ * vdec_MotionFrameDMV : motion compensation for dmv motion type (frame)
*****************************************************************************/
-void vdec_Motion444( macroblock_t * p_mb )
+void vdec_MotionFrameDMV( macroblock_t * p_mb )
{
+ /* This is necessarily a MOTION_FORWARD only macroblock */
+ fprintf(stderr, "DMV pas codee 2 !!!!!\n");
}
-#if 0
-
/*****************************************************************************
- * vdec_MotionMacroblock420 : motion compensation for a 4:2:0 macroblock
+ * vdec_Motion420 : motion compensation for a 4:2:0 macroblock
*****************************************************************************/
-void vdec_MotionMacroblock420( macroblock_t * p_mb )
+void vdec_Motion420( macroblock_t * p_mb, motion_arg_t * p_motion )
{
/* Luminance */
- /*
- MotionBlock( p_undec_p->p_forward->p_u, p_undec_p->p_forward->p_lookup_lum,
- p_undec_p->p_picture->i_width, p_u, i_mb_x, i_mb_y,
- p_undec_p->p_picture->i_width,
- p_undec_p->ppp_motion_vectors[0][0][0],
- p_undec_p->ppp_motion_vectors[0][0][1] );
- */
+ MotionComponent( /* source */
+ p_motion->p_source->p_y
+ + (p_mb->i_l_x + (p_motion->i_mv_x >> 1))
+ + ((p_mb->i_l_y + p_motion->i_offset
+ + (p_motion->i_mv_y >> 1))
+ + (p_motion->b_source_field - p_motion->b_dest_field))
+ * p_mb->p_picture->i_width,
+ /* destination */
+ p_mb->p_picture->p_y
+ + (p_mb->i_l_x)
+ + (p_mb->i_l_y) * p_mb->p_picture->i_width,
+ /* prediction width and height */
+ 16, p_motion->i_height,
+ /* step */
+ p_mb->i_l_stride,
+ /* select */
+ (p_motion->b_average << 2)
+ | ((p_motion->i_mv_y & 1) << 1)
+ | (p_motion->i_mv_x & 1) );
+
+ /* Chrominance Cr */
+ MotionComponent( p_motion->p_source->p_u
+ + (p_mb->i_c_x + ((p_motion->i_mv_x/2) >> 1))
+ + ((p_mb->i_c_y + (p_motion->i_offset >> 1)
+ + ((p_motion->i_mv_y/2) >> 1))
+ + (p_motion->b_source_field - p_motion->b_dest_field))
+ * p_mb->p_picture->i_chroma_width,
+ p_mb->p_picture->p_u
+ + (p_mb->i_c_x)
+ + (p_mb->i_c_y) * p_mb->p_picture->i_chroma_width,
+ 8, p_motion->i_height >> 1, p_mb->i_c_stride,
+ (p_motion->b_average << 2)
+ | (((p_motion->i_mv_y/2) & 1) << 1)
+ | ((p_motion->i_mv_x/2) & 1) );
+
+ /* Chrominance Cb */
+ MotionComponent( p_motion->p_source->p_v
+ + (p_mb->i_c_x + ((p_motion->i_mv_x/2) >> 1))
+ + ((p_mb->i_c_y + (p_motion->i_offset >> 1)
+ +((p_motion->i_mv_y/2) >> 1))
+ + (p_motion->b_source_field - p_motion->b_dest_field))
+ * p_mb->p_picture->i_chroma_width,
+ p_mb->p_picture->p_v
+ + (p_mb->i_c_x)
+ + (p_mb->i_c_y) * p_mb->p_picture->i_chroma_width,
+ 8, p_motion->i_height >> 1, p_mb->i_c_stride,
+ (p_motion->b_average << 2)
+ | (((p_motion->i_mv_y/2) & 1) << 1)
+ | ((p_motion->i_mv_x/2) & 1) );
}
/*****************************************************************************
- * MotionBlock : motion compensation for one 8x8 block
+ * vdec_Motion422 : motion compensation for a 4:2:2 macroblock
*****************************************************************************/
-void __inline__ MotionBlock( coeff_t * p_src, pel_lookup_table_t * p_lookup,
- int i_width_line,
- coeff_t * p_dest, int i_dest_x, i_dest_y,
- int i_stride_line,
- i_mv1_x, i_mv1_y, i_mv2_x, i_mv2_y )
+void vdec_Motion422( macroblock_t * p_mb, motion_arg_t * p_motion )
{
- static f_motion_c_t ComponentMode[4]
- = { &ComponentNN, &ComponentNH, &ComponentHN,
- &ComponentHH };
-
- int i_mode;
-
- i_mode = (i_mv_x & 1) | ((i_mv_y & 1) << 1);
-
- ComponentMode[i_mode]( p_src, p_lookup, i_width_line,
- p_dest, i_dest_x, i_dest_y,
- i_stride_line, i_mv1_x >> 1, i_mv1_y >> 1,
- i_mv2_x >> 1, i_mv2_y >> 1 );
+ fprintf(stderr, "La chrominance va chier dans la colle.\n");
}
/*****************************************************************************
- * ComponentNN : motion compensation without half pel
+ * vdec_Motion444 : motion compensation for a 4:4:4 macroblock
*****************************************************************************/
-void ComponentNN( coeff_t * p_src, pel_lookup_table_t * p_lookup,
- int i_width_line,
- coeff_t * p_dest, int i_dest_x, i_dest_y,
- int i_stride_line, i_mv1_x, i_mv1_y, i_mv2_x, i_mv2_y )
+void vdec_Motion444( macroblock_t * p_mb, motion_arg_t * p_motion )
{
- int i_vpos;
- register int i_hpos, i_src_loc;
-
- i_src_loc = (i_dest_y + i_mv1_y)*i_width_line + i_dest_x + i_mv1_x;
-
- for( i_vpos = 0; i_vpos < 4; i_vpos++ )
- {
- for( i_hpos = 0; i_hpos < 8; i_hpos++ )
- {
- p_dest[i_hpos] += p_src[p_lookup->pi_pel[i_src_loc + i_hpos]];
- }
-
- p_dest += 8;
- i_src_loc += i_stride_line;
- }
-
- i_src_loc = (i_dest_y + i_mv2_y)*i_width_line + i_dest_x + i_mv2_x;
-
- for( i_vpos = 4; i_vpos < 8; i_vpos++ )
- {
- for( i_hpos = 0; i_hpos < 8; i_hpos++ )
- {
- p_dest[i_hpos] += p_src[p_lookup->pi_pel[i_src_loc + i_hpos]];
- }
-
- p_dest += 8;
- i_src_loc += i_stride_line;
- }
+ fprintf(stderr, "La chrominance va chier dans le pastis.\n");
}
-
-#endif
projects / vlc / commitdiff