Changeset 6c955787f04e378771f64a66332218c522e7810e

Timestamp:

06/03/04 20:30:19 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

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

git-parent:

[116b248f45c865379ea479e3b7eaae038795200f]

git-author:

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

Message:

* src/input/input_dec.c: fix for input_EndDecoder() when using the async mode.
* modules/packetizer/copy.c: better not send pts instead of invalid ones.
* modules/stream_out/transcode.c: when no pts, use dts wherever possible (low delay / b frame).

Files:

• modules/packetizer/copy.c (modified) (3 diffs)
• modules/stream_out/transcode.c (modified) (7 diffs)
• src/input/input_dec.c (modified) (1 diff)

modules/packetizer/copy.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-: copy.c,v 1.23 2004/01/25 17:58:30 murray Exp 
+
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -262 +262 @@
-    *pp_block = NULL;
-
-
-
-
-
-
+
-    {
-        p_block->i_dts = p_block->i_pts;
-    }
-
-p
-
-p
+d
+
+d
-        block_Release( p_block );
-        return NULL;
@@ -286 +282 @@
-    return p_ret;
-}
-

modules/stream_out/transcode.c

@@ -137 +137 @@
-    int             i_crop_left;
-
+    mtime_t         i_input_dts;
-    mtime_t         i_input_pts;
+    vlc_bool_t      b_input_has_b_frames;
+
-    mtime_t         i_output_pts;
-};
@@ -168 +171 @@
-    p_sys->i_threads = 0;
-    p_sys->b_trellis = 0;
+    p_sys->b_input_has_b_frames = VLC_FALSE;
-
-    if( ( codec = sout_cfg_find_value( p_stream->p_cfg, "acodec" ) ) )
@@ -1331 +1335 @@
-    i_data = in->i_size;
-    p_data = in->p_buffer;
-
+
-    for( ;; )
-    {
@@ -1341 +1345 @@
-        frame = id->p_ff_pic;
-        p_sys->i_input_pts = in->i_pts;
+        p_sys->i_input_dts = in->i_dts;
-        if( id->ff_dec )
-        {
@@ -1359 +1364 @@
-            frame->pts = p_sys->i_input_pts ? p_sys->i_input_pts :
-                         AV_NOPTS_VALUE;
+
+            frame->pict_type = FF_I_TYPE;
-        }
-
@@ -1379 +1386 @@
-        {
-            p_sys->i_output_pts = frame->pts;
+        }
+
+        /* Sanity check (seems to be needed for some streams ) */
+        if( frame->pict_type == FF_B_TYPE )
+        {
+            p_sys->b_input_has_b_frames = VLC_TRUE;
-        }
-
@@ -1759 +1772 @@
-
-    /* Set PTS */
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return avcodec_default_get_buffer( p_context, p_frame );

src/input/input_dec.c

@@ -286 +286 @@
-        {
-            /* FIXME !!!!! */
-
+
+
-            {
-                msleep( 1000 );