Support pour le motion DMV.

diff --git a/include/vpar_blocks.h b/include/vpar_blocks.h
index 05a8cb023e9c763e56be58f23366e612c3f0c01a..6fd6955ca9e3a60e00dae9890a8a9dbd047ed232 100644 (file)
--- a/include/vpar_blocks.h
+++ b/include/vpar_blocks.h
@@ -45,6 +45,7 @@ typedef struct macroblock_s
     int                     ppi_field_select[2][2];
     int                     pppi_motion_vectors[2][2][2];
     int                     pi_dm_vector[2];
+    boolean_t               b_top_field_first;
     int                     i_motion_l_y;
     int                     i_motion_c_y;
     boolean_t               b_motion_field;

diff --git a/src/video_decoder/vdec_motion.c b/src/video_decoder/vdec_motion.c
index 5ff1a4ed8ef23f7b2c48bea6d197c5332c5a7a8a..8a2f08ff0377c9b3953a950c40e65d26955c92c8 100644 (file)
--- a/src/video_decoder/vdec_motion.c
+++ b/src/video_decoder/vdec_motion.c
@@ -225,6 +225,50 @@ static void __inline__ MotionComponent( yuv_data_t * p_src, yuv_data_t * p_dest,
     }
 }
 
+/*****************************************************************************
+ * DualPrimeArithmetic : Dual Prime Additional arithmetic (7.6.3.6)
+ *****************************************************************************/ 
+static void __inline__ DualPrimeArithmetic( macroblock_t * p_mb,
+                                            int ppi_dmv[2][2],
+                                            int i_mv_x, int i_mv_y )
+{
+    if( p_mb->i_structure == FRAME_STRUCTURE )
+    {
+        if( p_mb->b_top_field_first )
+        {
+            /* vector for prediction of top field from bottom field */
+            ppi_dmv[0][0] = ((i_mv_x + (i_mv_x > 0)) >> 1) + p_mb->pi_dm_vector[0];
+            ppi_dmv[0][1] = ((i_mv_y + (i_mv_y > 0)) >> 1) + p_mb->pi_dm_vector[1] - 1;
+
+            /* vector for prediction of bottom field from top field */
+            ppi_dmv[1][0] = ((3*i_mv_x + (i_mv_x > 0)) >> 1) + p_mb->pi_dm_vector[0];
+            ppi_dmv[1][1] = ((3*i_mv_y + (i_mv_y > 0)) >> 1) + p_mb->pi_dm_vector[1] + 1;
+        }
+        else
+        {
+            /* vector for prediction of top field from bottom field */
+            ppi_dmv[0][0] = ((3*i_mv_x + (i_mv_x > 0)) >> 1) + p_mb->pi_dm_vector[0];
+            ppi_dmv[0][1] = ((3*i_mv_y + (i_mv_y > 0)) >> 1) + p_mb->pi_dm_vector[1] - 1;
+
+            /* vector for prediction of bottom field from top field */
+            ppi_dmv[1][0] = ((i_mv_x + (i_mv_x > 0)) >> 1) + p_mb->pi_dm_vector[0];
+            ppi_dmv[1][1] = ((i_mv_y + (i_mv_y > 0)) >> 1) + p_mb->pi_dm_vector[1] + 1;
+        }
+    }
+    else
+    {
+        /* vector for prediction from field of opposite 'parity' */
+        ppi_dmv[0][0] = ((i_mv_x + (i_mv_x > 0)) >> 1) + p_mb->pi_dm_vector[0];
+        ppi_dmv[0][1] = ((i_mv_y + (i_mv_y > 0)) >> 1) + p_mb->pi_dm_vector[1];
+
+        /* correct for vertical field shift */
+        if( p_mb->i_structure == TOP_FIELD )
+            ppi_dmv[0][1]--;
+        else
+            ppi_dmv[0][1]++;
+    }
+}
+
 
 typedef struct motion_arg_s
 {
@@ -348,7 +392,37 @@ void vdec_MotionField16x8( 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");
+    motion_arg_t    args;
+    picture_t *     p_pred;
+    int             ppi_dmv[2][2];
+
+    args.i_height = 16;
+    args.b_average = 0;
+    args.b_dest_field = p_mb->b_motion_field;
+    args.i_offset = 0;
+
+    if( p_mb->i_current_structure == FRAME_STRUCTURE )
+        p_pred = p_mb->p_picture;
+    else
+        p_pred = p_mb->p_forward;
+
+    DualPrimeArithmetic( p_mb, ppi_dmv, p_mb->pppi_motion_vectors[0][0][0],
+                         p_mb->pppi_motion_vectors[0][0][1] );
+
+    /* predict from field of same parity */
+    args.p_source = p_mb->p_forward;
+    args.b_source_field = p_mb->b_motion_field;
+    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 );
+
+    /* predict from field of opposite parity */
+    args.b_average = 1;
+    args.p_source = p_pred;
+    args.b_source_field = !p_mb->b_motion_field;
+    args.i_mv_x = ppi_dmv[0][0];
+    args.i_mv_y = ppi_dmv[0][1];
+    p_mb->pf_chroma_motion( p_mb, &args );
 }
 
 /*****************************************************************************
@@ -440,7 +514,47 @@ void vdec_MotionFrameField( 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");
+    motion_arg_t    args;
+    int             ppi_dmv[2][2];
+
+    p_mb->i_l_stride <<= 1;
+    p_mb->i_c_stride <<= 1;
+    args.i_height = 8;
+    args.b_average = 0;
+    args.b_dest_field = 0;
+    args.i_offset = 0;
+    args.p_source = p_mb->p_forward;
+
+    DualPrimeArithmetic( p_mb, ppi_dmv, p_mb->pppi_motion_vectors[0][0][0],
+                         p_mb->pppi_motion_vectors[0][0][1] );
+
+    /* predict top field from top field */
+    args.b_source_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 );
+
+    /* predict and add to top field from bottom field */
+    args.b_average = 1;
+    args.b_source_field = 1;
+    args.i_mv_x = ppi_dmv[0][0];
+    args.i_mv_y = ppi_dmv[0][1];
+    p_mb->pf_chroma_motion( p_mb, &args );
+
+    /* predict bottom field from bottom field */
+    args.b_average = 0;
+    args.b_dest_field = 1;
+    args.b_source_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 );
+
+    /* predict and add to bottom field from top field */
+    args.b_average = 1;
+    args.b_source_field = 1;
+    args.i_mv_x = ppi_dmv[1][0];
+    args.i_mv_y = ppi_dmv[1][1];
+    p_mb->pf_chroma_motion( p_mb, &args );
 }
 
 /*****************************************************************************

diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index d1f41dd87d95a7d8b4e2420413ccae0bc1ebb8b8..9bc470164b316b2f9f4eab2b290bfcff320ad4c3 100644 (file)
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -579,6 +579,7 @@ static __inline__ void InitMacroblock( vpar_thread_t * p_vpar,
     p_mb->p_picture = p_vpar->picture.p_picture;
     p_mb->i_structure = p_vpar->picture.i_structure;
     p_mb->i_current_structure = p_vpar->picture.i_current_structure;
+    p_mb->b_top_field_first = p_vpar->picture.b_top_field_first;
     p_mb->i_l_x = p_vpar->mb.i_l_x;
     p_mb->i_motion_l_y = p_mb->i_l_y = p_vpar->mb.i_l_y;
     p_mb->i_c_x = p_vpar->mb.i_c_x;