* ./BUGS: added a list of known bugs. Please add your findings!

[vlc] / plugins / mpeg_vdec / vpar_blocks.c

diff --git a/plugins/mpeg_vdec/vpar_blocks.c b/plugins/mpeg_vdec/vpar_blocks.c
index e4e2893d4dabfa0e1028bbe9701571a249b94593..801d5533f475ffd145ce75dbdc73d4a66e9e2a36 100644 (file)
--- a/plugins/mpeg_vdec/vpar_blocks.c
+++ b/plugins/mpeg_vdec/vpar_blocks.c
@@ -2,7 +2,7 @@
  * vpar_blocks.c : blocks parsing
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: vpar_blocks.c,v 1.5 2001/12/30 07:09:56 sam Exp $
+ * $Id: vpar_blocks.c,v 1.6 2002/01/04 14:01:34 sam Exp $
  *
  * Authors: Michel Lespinasse <walken@zoy.org>
  *          Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
@@ -1814,20 +1814,20 @@ static __inline__ void ParseSlice( vpar_thread_t * p_vpar,
         if( i_coding_type != I_CODING_TYPE || p_vpar->picture.b_concealment_mv )
         {
             p_f_motion->pppi_ref[1][0] =
-                pp_forward_ref[1]->P_Y + i_offset * 4 + i_width;
+                pp_forward_ref[1]->Y_PIXELS + i_offset * 4 + i_width;
             p_f_motion->pppi_ref[1][1] =
-                pp_forward_ref[1]->P_U + i_chroma_tmp;
+                pp_forward_ref[1]->U_PIXELS + i_chroma_tmp;
             p_f_motion->pppi_ref[1][2] =
-                pp_forward_ref[1]->P_V + i_chroma_tmp;
+                pp_forward_ref[1]->V_PIXELS + i_chroma_tmp;
         }
         if( i_coding_type == B_CODING_TYPE )
         {
             p_b_motion->pppi_ref[1][0] =
-                p_vpar->sequence.p_backward->P_Y + i_offset * 4 + i_width;
+                p_vpar->sequence.p_backward->Y_PIXELS + i_offset * 4 + i_width;
             p_b_motion->pppi_ref[1][1] =
-                p_vpar->sequence.p_backward->P_U + i_chroma_tmp;
+                p_vpar->sequence.p_backward->U_PIXELS + i_chroma_tmp;
             p_b_motion->pppi_ref[1][2] =
-                p_vpar->sequence.p_backward->P_V + i_chroma_tmp;
+                p_vpar->sequence.p_backward->V_PIXELS + i_chroma_tmp;
         }
     }
 
@@ -1836,9 +1836,9 @@ static __inline__ void ParseSlice( vpar_thread_t * p_vpar,
                         * (2 - p_vpar->sequence.b_chroma_h_subsampled);
     if( i_coding_type != I_CODING_TYPE || p_vpar->picture.b_concealment_mv )
     {
-        p_f_motion->pppi_ref[0][0] = pp_forward_ref[0]->P_Y + i_offset * 4;
-        p_f_motion->pppi_ref[0][1] = pp_forward_ref[0]->P_U + i_chroma_tmp;
-        p_f_motion->pppi_ref[0][2] = pp_forward_ref[0]->P_V + i_chroma_tmp;
+        p_f_motion->pppi_ref[0][0] = pp_forward_ref[0]->Y_PIXELS + i_offset * 4;
+        p_f_motion->pppi_ref[0][1] = pp_forward_ref[0]->U_PIXELS + i_chroma_tmp;
+        p_f_motion->pppi_ref[0][2] = pp_forward_ref[0]->V_PIXELS + i_chroma_tmp;
         p_f_motion->pi_f_code[0] = p_vpar->picture.ppi_f_code[0][0];
         p_f_motion->pi_f_code[1] = p_vpar->picture.ppi_f_code[0][1];
         p_f_motion->ppi_pmv[0][0] = p_f_motion->ppi_pmv[0][1] = 0;
@@ -1847,12 +1847,12 @@ static __inline__ void ParseSlice( vpar_thread_t * p_vpar,
 
     if( i_coding_type == B_CODING_TYPE )
     {
-        p_b_motion->pppi_ref[0][0] = p_vpar->sequence.p_backward->P_Y
+        p_b_motion->pppi_ref[0][0] = p_vpar->sequence.p_backward->Y_PIXELS
                                         + i_offset * 4;
-        p_b_motion->pppi_ref[0][1] = p_vpar->sequence.p_backward->P_U
-            + i_chroma_tmp;
-        p_b_motion->pppi_ref[0][2] = p_vpar->sequence.p_backward->P_V
-            + i_chroma_tmp;
+        p_b_motion->pppi_ref[0][1] = p_vpar->sequence.p_backward->U_PIXELS
+                                        + i_chroma_tmp;
+        p_b_motion->pppi_ref[0][2] = p_vpar->sequence.p_backward->V_PIXELS
+                                        + i_chroma_tmp;
         p_b_motion->pi_f_code[0] = p_vpar->picture.ppi_f_code[1][0];
         p_b_motion->pi_f_code[1] = p_vpar->picture.ppi_f_code[1][1];
         p_b_motion->ppi_pmv[0][0] = p_b_motion->ppi_pmv[0][1] = 0;
@@ -1860,9 +1860,9 @@ static __inline__ void ParseSlice( vpar_thread_t * p_vpar,
     }
 
     /* Initialize destination pointers. */
-    p_dest[0] = p_vpar->picture.p_picture->P_Y + i_offset * 4;
-    p_dest[1] = p_vpar->picture.p_picture->P_U + i_chroma_tmp;
-    p_dest[2] = p_vpar->picture.p_picture->P_V + i_chroma_tmp;
+    p_dest[0] = p_vpar->picture.p_picture->Y_PIXELS + i_offset * 4;
+    p_dest[1] = p_vpar->picture.p_picture->U_PIXELS + i_chroma_tmp;
+    p_dest[2] = p_vpar->picture.p_picture->V_PIXELS + i_chroma_tmp;
 
     if( i_structure == BOTTOM_FIELD )
     {