Changeset 5d3d5ee7b9480de73e87a54355378447127735cd

Timestamp:

08/11/06 15:24:54 (2 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1162995894 +0000

git-parent:

[b1b72b632aed8ccf9624093214efe1329093e6f8]

git-author:

Christophe Massiot <massiot@videolan.org> 1162995894 +0000

Message:

• modules/codec/libmpeg2.c, modules/packetizer/mpegvideo.c: Fixed wrong PTS
  and DTS for field pictures.
  

Files:

• modules/codec/libmpeg2.c (modified) (4 diffs)
• modules/packetizer/mpegvideo.c (modified) (5 diffs)

modules/codec/libmpeg2.c

@@ -65 +65 @@
-                                               * the sequence header ?    */
-    vlc_bool_t       b_slice_i;             /* intra-slice refresh stream */
-
-
+
+
+
-
-    /*
@@ -144 +145 @@
-    p_sys->b_garbage_pic = 0;
-    p_sys->b_slice_i  = 0;
+    p_sys->b_second_field = 0;
-    p_sys->b_skip     = 0;
-    p_sys->b_preroll = VLC_FALSE;
@@ -340 +342 @@
-
-        case STATE_PICTURE_2ND:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            break;
-
@@ -409 +398 @@
-#endif
-
+            /* If nb_fields == 1, it is a field picture, and it will be
+             * followed by another field picture for which we won't call
+             * vout_SynchroNewPicture() because this would have other 
+             * problems, so we take it into account here.
+             * This kind of sucks, but I didn't think better. --Meuuh
+             */
-            vout_SynchroNewPicture( p_sys->p_synchro,
-                p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
+                p_sys->p_info->current_picture->nb_fields == 1 ? 2 :
-                p_sys->p_info->current_picture->nb_fields, i_pts, i_dts,
-                p_sys->i_current_rate,

modules/packetizer/mpegvideo.c

@@ -119 +119 @@
-    mtime_t i_old_duration;
-    mtime_t i_last_ref_pts;
+    vlc_bool_t b_second_field;
-
-    /* Number of pictures since last sequence header */
@@ -186 +187 @@
-    p_sys->i_old_duration = 0;
-    p_sys->i_last_ref_pts = 0;
+    p_sys->b_second_field = 0;
-
-    p_sys->b_discontinuity = VLC_FALSE;
@@ -434 +436 @@
-        {
-            /* Correct interpolated dts when we receive a new pts/dts */
-
+&& !p_sys->b_second_field 
-                p_sys->i_interpolated_dts = p_sys->i_last_ref_pts;
-            if( p_sys->i_dts > 0 ) p_sys->i_interpolated_dts = p_sys->i_dts;
-
-
+
+
-        }
-
-        p_pic->i_dts = p_sys->i_interpolated_dts;
+        p_sys->i_interpolated_dts += i_duration;
-
-        /* Set PTS only if we have a B frame or if it comes from the stream */
@@ -455 +459 @@
-        {
-            p_pic->i_pts = 0;
-        }
-
-        if( p_sys->b_low_delay || p_sys->i_picture_type == 0x03 )
-        {
-            /* Trivial case (DTS == PTS) */
-            p_sys->i_interpolated_dts += i_duration;
-        }
-        else
-        {
-            p_sys->i_interpolated_dts += p_sys->i_old_duration;
-            p_sys->i_old_duration = i_duration;
-        }
-
@@ -492 +485 @@
-        p_sys->pp_last = &p_sys->p_frame;
-        p_sys->b_frame_slice = VLC_FALSE;
+
+        if( p_sys->i_picture_structure != 0x03 )
+        {
+            p_sys->b_second_field = !p_sys->b_second_field;
+        }
+        else
+        {
+            p_sys->b_second_field = 0;
+        }
-    }
-