Debut de la partie parser du motion compensation.

diff --git a/include/vpar_blocks.h b/include/vpar_blocks.h
index b787af1528d69cb5d5caee47bb36ca0ddce433dc..4ba49cd824c049d10eaf07749977f9974820af5c 100644 (file)
--- a/include/vpar_blocks.h
+++ b/include/vpar_blocks.h
@@ -41,13 +41,10 @@ typedef struct macroblock_s
     picture_t *             p_backw_bot;
     picture_t *             p_forw_top;
     picture_t *             p_forw_bot;
-    int                     i_field_select_backw_top, i_field_select_backw_bot;
-    int                     i_field_select_forw_top, i_field_select_forw_bot;
-    int                     pi_motion_vectors_backw_top[2];
-    int                     pi_motion_vectors_backw_bot[2];
-    int                     pi_motion_vectors_forw_top[2];
-    int                     pi_motion_vectors_forw_bot[2];
-
+    int                     ppi_field_select[2][2];
+    int                     pppi_motion_vectors[2][2][2];
+    int                     pi_dm_vector[2];
+   
     /* AddBlock information */
     f_addb_t                pf_addb[12];      /* pointer to the Add function */
     data_t *                p_data[12];              /* pointer to the position
@@ -61,6 +58,7 @@ typedef struct macroblock_s
 typedef struct
 {
     int                     i_mb_type, i_motion_type, i_mv_count, i_mv_format;
+    boolean_t               b_dmv;
     /* AddressIncrement information */
     int                     i_addr_inc;
     int                     i_coded_block_pattern;

diff --git a/include/vpar_headers.h b/include/vpar_headers.h
index 868b5a417c7eb77ea038f767f3d3212d2e0cf365..9b97d631466a52adeed7468dfea2e564f3963d96 100644 (file)
--- a/include/vpar_headers.h
+++ b/include/vpar_headers.h
@@ -76,7 +76,7 @@ typedef struct sequence_s
  *****************************************************************************/
 typedef struct picture_parsing_s
 {
-    boolean_t           b_full_pel_forward_vector, b_full_pel_backward_vector;
+    boolean_t           pb_full_pel_vector[2];
     int                 i_forward_f_code, i_backward_f_code;
 
     int                 ppi_f_code[2][2];
@@ -99,6 +99,9 @@ typedef struct picture_parsing_s
     boolean_t           b_frame_structure;
     f_macroblock_type_t pf_macroblock_type;
 
+    /* Scalability variables */
+    int                 i_spatial_temporal_weight_code_table_index;
+    
     boolean_t           b_error;
 } picture_parsing_t;
 

diff --git a/include/vpar_motion.h b/include/vpar_motion.h
new file mode 100644 (file)
index 0000000..fdfe328
--- /dev/null
+++ b/include/vpar_motion.h
@@ -0,0 +1,16 @@
+/*****************************************************************************
+ * vpar_motion.h : video parser motion compensation management
+ * (c)1999 VideoLAN
+ *****************************************************************************/
+
+typedef struct
+{
+  char i_val, i_len;
+} mv_tab_t;
+
+/*
+ * Prototypes
+ */
+
+void vpar_MPEG1MotionVector ( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_s );
+void vpar_MPEG2MotionVector ( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_s );

diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c
index 76f1529e3bf719f7fa1f360141f2adc64b94bd60..adab006f959ae2e460dfc7f964d88287e85fbed5 100644 (file)
--- a/src/video_parser/vpar_blocks.c
+++ b/src/video_parser/vpar_blocks.c
@@ -571,6 +571,8 @@ static __inline__ void MacroblockModes( vpar_thread_t * p_vpar,
             }
         }
     }
+
+    p_vpar->mb.b_dmv = p_vpar->mb.i_motion_type == MOTION_DMV;
 }
 
 /*****************************************************************************

diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c
index 87bfa3d2a054c4b5939bfae530caddde6f6325b5..47b1522173b542b19995cdc437cb396729de3c40 100644 (file)
--- a/src/video_parser/vpar_headers.c
+++ b/src/video_parser/vpar_headers.c
@@ -38,6 +38,7 @@
 #include "video_fifo.h"
 #include "vpar_synchro.h"
 #include "video_parser.h"
+#include "vpar_motion.h"
 
 /*
  * Local prototypes
@@ -435,9 +436,9 @@ static void PictureHeader( vpar_thread_t * p_vpar )
     
     DumpBits( &p_vpar->bit_stream, 16 ); /* vbv_delay */
     
-    p_vpar->picture.b_full_pel_forward_vector = GetBits( &p_vpar->bit_stream, 1 );
+    p_vpar->picture.pb_full_pel_vector[0] = GetBits( &p_vpar->bit_stream, 1 );
     p_vpar->picture.i_forward_f_code = GetBits( &p_vpar->bit_stream, 3 );
-    p_vpar->picture.b_full_pel_backward_vector = GetBits( &p_vpar->bit_stream, 1 );
+    p_vpar->picture.pb_full_pel_vector[1] = GetBits( &p_vpar->bit_stream, 1 );
     p_vpar->picture.i_backward_f_code = GetBits( &p_vpar->bit_stream, 3 );
 
     /* extra_information_picture */
@@ -928,6 +929,8 @@ static void PictureSpatialScalableExtension( vpar_thread_t * p_vpar )
     /* That's scalable, so we trash it */
     DumpBits32( &p_vpar->bit_stream );
     DumpBits( &p_vpar->bit_stream, 14 );
+    p_vpar->picture.i_spatial_temporal_weight_code_table_index = GetBits( &p_vpar->bit_stream, 2 );
+    DumpBits( &p_vpar->bit_stream, 2 );
 }
 
 

diff --git a/src/video_parser/vpar_motion.c b/src/video_parser/vpar_motion.c
index e4b740412fedd2f9887494c87e4747c5d542e992..b0761c770a51a48a9f603d6bf74dc3c3ed4054fd 100644 (file)
--- a/src/video_parser/vpar_motion.c
+++ b/src/video_parser/vpar_motion.c
@@ -38,23 +38,168 @@
 #include "video_fifo.h"
 #include "vpar_synchro.h"
 #include "video_parser.h"
+#include "vpar_motion.h"
+
+/* mv_format */
+#define MV_FIELD 0
+#define MV_FRAME 1
 
 /*
  * Local prototypes
  */
 
-/*****************************************************************************
- * vpar_MPEG1MotionVector : Parse the next MPEG-1 motion vector
- *****************************************************************************/
-void vpar_MPEG1MotionVector( vpar_thread_t * p_vpar, int i_mv )
+/****************************************************************************
+ * vpar_MotionCode : Parse the next motion code
+ ****************************************************************************/
+static __inline__ int vpar_MotionCode( vpar_thread_t * p_vpar )
+{
+    int i_code;
+   static mv_tab_t p_mv_tab0[8] = 
+        { {-1,0}, {3,3}, {2,2}, {2,2}, {1,1}, {1,1}, {1,1}, {1,1} };
+    /* Table B-10, motion_code, codes 0000011 ... 000011x */
+    static mv_tab_t p_mv_tab1[8] =
+        { {-1,0}, {-1,0}, {-1,0}, {7,6}, {6,6}, {5,6}, {4,5}, {4,5} };
+    /* Table B-10, motion_code, codes 0000001100 ... 000001011x */
+    static mv_tab_t p_mv_tab2[12] = {
+        {16,9}, {15,9}, {14,9}, {13,9},
+        {12,9}, {11,9}, {10,8}, {10,8},
+        {9,8},  {9,8},  {8,8},  {8,8} };
+    
+   if( GetBits(&p_vpar->bit_stream, 1) )
+   {
+       return 0;
+   }
+
+   if( (i_code = ShowBits(&p_vpar->bit_stream, 9)) >= 64 )
+   {
+       i_code >>= 6;
+       DumpBits( &p_vpar->bit_stream, p_mv_tab0[0].i_len );
+       return( GetBits(&p_vpar->bit_stream, 1) ? -p_mv_tab0[i_code].i_val : p_mv_tab0[i_code].i_val );
+   }
+
+   if( i_code >= 24 )
+   {
+       i_code >>= 3;
+       DumpBits( &p_vpar->bit_stream, p_mv_tab1[0].i_len );
+       return( GetBits(&p_vpar->bit_stream, 1) ? -p_mv_tab1[i_code].i_val : p_mv_tab1[i_code].i_val );
+   }
+
+   if( (i_code -= 12) < 0 )
+   {
+       intf_DbgMsg( "vpar debug: Invalid motion_vector code\n" );
+       return 0;
+   }
+
+   DumpBits( &p_vpar->bit_stream, p_mv_tab2[0].i_len );
+   return( GetBits(&p_vpar->bit_stream, 1) ? -p_mv_tab2[i_code].i_val : p_mv_tab2[i_code].i_val );            
+}
+
+/****************************************************************************
+ * vpar_DecodeMotionVector : decode a motion_vector
+ ****************************************************************************/
+static __inline__ void vpar_DecodeMotionVector( int * pi_prediction, int i_r_size,
+        int i_motion_code, int i_motion_residual, int i_full_pel )
+{
+    int i_limit, i_vector;
+
+    /* ISO/IEC 13818-1 section 7.6.3.1 */
+    i_limit = 16 << i_r_size;
+    i_vector = *pi_prediction >> i_full_pel;
+
+    if( i_motion_code < 0 )
+    {
+        i_vector += ((i_motion_code-1) << i_r_size) + i_motion_residual + 1;
+        if( i_vector >= i_limit )
+            i_vector -= i_limit << 1;
+    }
+    else if( i_motion_code > 0 )
+    {
+        i_vector -= ((-i_motion_code-1) << i_r_size) + i_motion_residual + 1;
+        if( i_vector < i_limit )
+            i_vector += i_limit << 1;
+    }
+
+    *pi_prediction = i_vector << i_full_pel;
+}
+
+/****************************************************************************
+ * vpar_MotionVector : Parse the next motion_vector field
+ ****************************************************************************/
+void vpar_MotionVector( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_r,
+        int i_s, int i_full_pel )
 {
+        
+    int i_motion_code, i_motion_residual;
+    int i_r_size;
+
+    i_r_size = p_vpar->picture.ppi_f_code[i_s][0]-1;
+    i_motion_code = vpar_MotionCode( p_vpar );
+    i_motion_residual = (i_r_size != 0 && i_motion_code != 0) ?
+                        GetBits( &p_vpar->bit_stream, i_r_size) : 0;
+    vpar_DecodeMotionVector( &p_vpar->slice.pppi_pmv[i_r][i_s][0], i_r_size,
+                             i_motion_code, i_motion_residual, i_full_pel );
+    p_mb->pppi_motion_vectors[i_r][i_s][0] = p_vpar->slice.pppi_pmv[i_r][i_s][0];
 
+    if( p_vpar->mb.b_dmv )
+    {
+        if( GetBits(&p_vpar->bit_stream, 1) )
+        {
+            p_mb->pi_dm_vector[0] = GetBits( &p_vpar->bit_stream, 1 ) ? -1 : 1;
+        }
+        else
+        {
+            p_mb->pi_dm_vector[0] = 0;
+        }
+    }
+    
+    i_r_size = p_vpar->picture.ppi_f_code[i_s][1]-1;
+    i_motion_code = vpar_MotionCode( p_vpar );
+    i_motion_residual = (i_r_size != 0 && i_motion_code != 0) ?
+                        GetBits( &p_vpar->bit_stream, i_r_size) : 0;
+    vpar_DecodeMotionVector( &p_vpar->slice.pppi_pmv[i_r][i_s][1], i_r_size,
+                             i_motion_code, i_motion_residual, i_full_pel );
+    p_mb->pppi_motion_vectors[i_r][i_s][1] = p_vpar->slice.pppi_pmv[i_r][i_s][1];
+
+    if( p_vpar->mb.b_dmv )
+    {
+        if( GetBits(&p_vpar->bit_stream, 1) )
+        {
+            p_mb->pi_dm_vector[1] = GetBits( &p_vpar->bit_stream, 1 ) ? -1 : 1;
+        }
+        else
+        {
+            p_mb->pi_dm_vector[1] = 0;
+        }
+    }
 }
 
 /*****************************************************************************
- * vpar_MPEG2MotionVector : Parse the next MPEG-2 motion vector
+ * vpar_MPEG1MotionVector : Parse the next MPEG-1 motion vectors
  *****************************************************************************/
-void vpar_MPEG2MotionVector( vpar_thread_t * p_vpar, int i_mv )
+void vpar_MPEG1MotionVector( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_s )
 {
+    p_vpar_MotionVector( p_vpar, p_mb, 0, i_s, p_vpar->picture.pb_full_pel_vector[i_s] );
+}
 
+/*****************************************************************************
+ * vpar_MPEG2MotionVector : Parse the next MPEG-2 motion_vectors field
+ *****************************************************************************/
+void vpar_MPEG2MotionVector( vpar_thread_t * p_vpar, macroblock_t * p_mb, int i_s )
+{
+    if( p_vpar->mb.i_mv_count == 1 )
+    {
+        if( p_vpar->mb.i_mv_format == MV_FIELD && !p_vpar->mb.b_dmv )
+        {
+            p_mb->ppi_field_select[0][i_s] = p_mb->ppi_field_select[1][i_s]
+                                            = GetBits( &p_vpar->bit_stream, 1 );
+        }
+        vpar_MotionVector( p_vpar, p_mb, 0, i_s, 0 );
+    }
+    else
+    {
+        p_mb->ppi_field_select[0][i_s] = GetBits( &p_vpar->bit_stream, 1 );
+        vpar_MotionVector( p_vpar, p_mb, 0, i_s, 0 );
+        p_mb->ppi_field_select[1][i_s] = GetBits( &p_vpar->bit_stream, 1 );
+        vpar_MotionVector( p_vpar, p_mb, 1, i_s, 0 );
+    }
 }