Changeset b691d5d74ab962f1d9717cdfa2c576925d903116

Timestamp:

21/11/07 19:02:04 (11 months ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

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

git-parent:

[d4bbae044e7958a24d21cc4b80bd663d61e6d9a3]

git-author:

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

Message:

• modules/codec/x264.c: Fixed DTS when adaptive B frames are used (still
  wrong for bpyramid, though).
  

Files:

• modules/codec/x264.c (modified) (5 diffs)

modules/codec/x264.c

@@ -670 +670 @@
-    uint8_t         *p_buffer;
-
-last_ref_p
+interpolated_d
-
-    char *psz_stat_name;
@@ -721 +721 @@
-    p_enc->pf_encode_audio = NULL;
-    p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
-last_ref_p
+interpolated_d
-    p_sys->psz_stat_name = NULL;
-
@@ -1240 +1240 @@
-            p_enc->fmt_in.video.i_frame_rate;
-
-dts = p_block->i_
+
-
-    if( p_sys->param.i_bframe > 0 )
@@ -1246 +1246 @@
-        if( p_block->i_flags & BLOCK_FLAG_TYPE_B )
-        {
+            /* FIXME : this is wrong if bpyramid is set */
-            p_block->i_dts = p_block->i_pts;
+            p_sys->i_interpolated_dts = p_block->i_dts;
-        }
-        else
-        {
-last_ref_p
+interpolated_d
-            {
-last_ref_p
+interpolated_d
-            }
-            else
@@ -1260 +1262 @@
-            }
-
-last_ref_pts = p_block->i_pts
+interpolated_dts += p_block->i_length
-        }
+    }
+    else
+    {
+        p_block->i_dts = p_block->i_pts;
-    }
-