Changeset ad0117b6be6bb0b5256748eb54efa7f6f3ab79f4

Timestamp:

25/04/07 21:15:39 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1177528539 +0000

git-parent:

[eaf3e693968f6d9aaea7cf2c38ed02712753f704]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1177528539 +0000

Message:

Patch from Paul Corke for rawdv to advance the timestamp when it is about to fall behind because the hardware sometimes skips a frame on a live feed. Renamed - -rawdv-realtime to --rawdv-hurry-up because its working is similar to --sout-transcode-hurry-up. Also fixed a potential memory leak.

Files:

• THANKS (modified) (1 diff)
• modules/demux/rawdv.c (modified) (9 diffs)

THANKS

@@ -144 +144 @@
-Patrick McLean <chutzpah at gentoo d0t org> - Libcdio update patch
-Paul Corke <paul.corke at datatote dot co do uk> - pvr patch for newer ivtv drivers
+Paul Corke <paul.corke at datatote dot co do uk> - dv patch to keep up with the hardware
-Paul Mackerras <paulus at linuxcare.com.au> - AltiVec IDCT and motion
-Pavlov Konstantin “thresh” - several Linux build system fixes

modules/demux/rawdv.c

@@ -6 +6 @@
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ *          Paul Corke <paul dot corke at datatote dot co dot uk>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -33 +34 @@
- * Module descriptor
- *****************************************************************************/
+#define HURRYUP_TEXT N_( "Hurry up" )
+#define HURRYUP_LONGTEXT N_( "The demuxer will advance timestamps if the " \
+                "input can't keep up with the rate." )
+
-static int  Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
@@ -42 +47 @@
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_DEMUX );
+    add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, VLC_FALSE );
-    set_callbacks( Open, Close );
-    add_shortcut( "rawdv" );
@@ -105 +111 @@
-    /* program clock reference (in units of 90kHz) */
-    mtime_t i_pcr;
+    vlc_bool_t b_hurry_up;
-};
-
@@ -197 +204 @@
-    p_peek += 72;                                  /* skip rest of DIF block */
-
-
-    /* Set p_input field */
-    p_demux->pf_demux   = Demux;
-    p_demux->pf_control = Control;
-    p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
+
+    p_sys->b_hurry_up = var_CreateGetBool( p_demux, "rawdv-hurry-up" );
+    msg_Dbg( p_demux, "Realtime DV Source: %s", (p_sys->b_hurry_up)?"Yes":"No" );
-
-    p_sys->i_dsf = dv_header.dsf;
@@ -265 +276 @@
-    demux_sys_t *p_sys  = p_demux->p_sys;
-
+    var_Destroy( p_demux, "rawdv-hurry-up");
-    free( p_sys );
-}
@@ -279 +291 @@
-    vlc_bool_t  b_audio = VLC_FALSE;
-
+    if( p_sys->b_hurry_up )
+    {
+         /* 3 frames */
+        p_sys->i_pcr = mdate() + (p_sys->i_dsf ? 120000 : 90000);
+    }
+
-    /* Call the pace control */
-    es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
-
-( p_block = stream_Block( p_demux->s, p_sys->frame_size ) )
+
+p_block
-    {
-        /* EOF */
@@ -310 +328 @@
-    es_out_Send( p_demux->out, p_sys->p_es_video, p_block );
-
-
+
+
+
+
-
-    return 1;
@@ -473 +494 @@
-    return p_block;
-}
-
-