Changeset dfc8392cd3b2de84dc55e0f4dabf9de63e4d2a42

Timestamp:

22/08/06 21:03:20 (2 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1156273400 +0000

git-parent:

[834b64d0f742bf300b015afdfef91a5f3fa7382c]

git-author:

Gildas Bazin <gbazin@videolan.org> 1156273400 +0000

Message:

* modules/codec/ffmpeg/mux.c: libavformat is much more happy with timestamps which start from 0.

Files:

• modules/codec/ffmpeg/mux.c (modified) (6 diffs)

modules/codec/ffmpeg/mux.c

@@ -60 +60 @@
-    vlc_bool_t     b_write_header;
-    vlc_bool_t     b_error;
+
+    int64_t        i_initial_dts;
-};
-
@@ -136 +138 @@
-    p_sys->b_write_header = VLC_TRUE;
-    p_sys->b_error = VLC_FALSE;
+    p_sys->i_initial_dts = 0;
-
-    return VLC_SUCCESS;
@@ -288 +291 @@
-    if( pi_stream ) *pi_stream = i_stream;
-    if( pi_dts ) *pi_dts = i_dts;
+    if( !p_mux->p_sys->i_initial_dts ) p_mux->p_sys->i_initial_dts = i_dts;
-    return i_stream;
-}
@@ -296 +300 @@
-    block_t *p_data = block_FifoGet( p_input->p_fifo );
-    int i_stream = *((int *)p_input->p_sys);
+    AVStream *p_stream = p_sys->oc->streams[i_stream];
-    AVPacket pkt = {0};
-
+    av_init_packet(&pkt);
-    pkt.data = p_data->p_buffer;
-    pkt.size = p_data->i_buffer;
@@ -303 +309 @@
-
-    if( p_data->i_flags & BLOCK_FLAG_TYPE_I ) pkt.flags |= PKT_FLAG_KEY;
+
+    /* avformat expects pts/dts which start from 0 */
+    p_data->i_dts -= p_mux->p_sys->i_initial_dts;
+    p_data->i_pts -= p_mux->p_sys->i_initial_dts;
+
-    if( p_data->i_pts > 0 )
-ys->oc->streams[i_stream]
-ys->oc->streams[i_stream]
+tream
+tream
-    if( p_data->i_dts > 0 )
-ys->oc->streams[i_stream]
-ys->oc->streams[i_stream]
+tream
+tream
-
-    if( av_write_frame( p_sys->oc, &pkt ) < 0 )
@@ -315 +326 @@
-                 "(pkt pts: "I64Fd", dts: "I64Fd")",
-                 p_data->i_pts, p_data->i_dts, pkt.pts, pkt.dts );
+        block_Release( p_data );
-        return VLC_EGENERIC;
-    }