Changeset aa407ea9ca0beca090021e1bc26c4d9f84f003df

Timestamp:

26/08/08 23:27:56 (3 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1219786076 +0200

git-parent:

[b08b569203e1789fdec40e943ac57fbbf16a52a9]

git-author:

Laurent Aimar <fenrir@videolan.org> 1219748058 +0200

Message:

Added record support at the stream_t level in core.

The record access_filter will become useless as soon as all demuxers that can
support it will be modified.
The record support is half done. I will also add es_out_t record functionnalities,
and a way to selected one of them if both are supported.

Files:

• include/vlc_demux.h (modified) (1 diff)
• include/vlc_input.h (modified) (1 diff)
• include/vlc_stream.h (modified) (1 diff)
• modules/control/hotkeys.c (modified) (1 diff)
• modules/demux/ts.c (modified) (5 diffs)
• modules/gui/qt4/components/interface_widgets.cpp (modified) (2 diffs)
• src/input/control.c (modified) (2 diffs)
• src/input/decoder.c (modified) (4 diffs)
• src/input/demux.c (modified) (2 diffs)
• src/input/input.c (modified) (10 diffs)
• src/input/input_internal.h (modified) (4 diffs)
• src/input/stream.c (modified) (11 diffs)
• src/input/var.c (modified) (6 diffs)
• src/libvlc-module.c (modified) (2 diffs)

include/vlc_demux.h

@@ -125 +125 @@
-    DEMUX_GET_ATTACHMENTS,      /* arg1=input_attachment_t***, int* res=can fail */
-
+    /* RECORD you should accept it only if the stream can be recorded without
+     * any modification or header addition. */
+    DEMUX_CAN_RECORD,           /* arg1=bool*   res=can fail(assume false) */
+    DEMUX_SET_RECORD_STATE,     /* arg1=bool    res=can fail */
+
+
-    /* II. Specific access_demux queries */
-,         
+ = 0x1000,
-    DEMUX_SET_PAUSE_STATE,      /* arg1= bool     can fail */
-

include/vlc_input.h

@@ -525 +525 @@
-
-    /* On the fly input slave */
-
+
+
+
+
+
-};
-

include/vlc_stream.h

@@ -65 +65 @@
-                             if access unreachable or access control answer */
-
-
+
+
+
+
+
-};
-

modules/control/hotkeys.c

@@ -811 +811 @@
-                osd_MenuActivate( VLC_OBJECT(p_intf) );
-            }
+            else if( i_action == ACTIONID_RECORD )
+            {
+                if( var_GetBool( p_input, "can-record" ) )
+                {
+                    const bool b_record = !var_GetBool( p_input, "record" );
+
+                    if( b_record )
+                        vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording") );
+                    else
+                        vout_OSDMessage( p_intf, DEFAULT_CHAN, _("Recording done") );
+                    var_SetBool( p_input, "record", b_record );
+                }
+            }
-        }
-        if( p_vout )

modules/demux/ts.c

@@ -371 +371 @@
-    /* */
-    bool        b_meta;
+
+    /* */
+    bool        b_start_record;
-};
-
@@ -643 +646 @@
-    p_sys->i_ts_read = 50;
-    p_sys->csa = NULL;
+    p_sys->b_start_record = false;
-
-    /* Init PAT handler */
@@ -1092 +1096 @@
-        }
-
+        if( p_sys->b_start_record )
+        {
+            /* Enable recording once synchronized */
+            stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, true, "ts" );
+            p_sys->b_start_record = false;
+        }
+
-        if( p_sys->b_udp_out )
-        {
@@ -1191 +1202 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-    double f, *pf;
+    bool b_bool, *pb_bool;
-    int64_t i64;
-    int64_t *pi64;
@@ -1386 +1398 @@
-            return VLC_SUCCESS;
-        }
+
+        case DEMUX_CAN_RECORD:
+            pb_bool = (bool*)va_arg( args, bool * );
+            *pb_bool = true;
+            return VLC_SUCCESS;
+
+        case DEMUX_SET_RECORD_STATE:
+            b_bool = (bool)va_arg( args, int );
+
+            if( !b_bool )
+                stream_Control( p_demux->s, STREAM_SET_RECORD_STATE, false );
+            p_sys->b_start_record = b_bool;
+            return VLC_SUCCESS;
-
-        case DEMUX_GET_FPS:

modules/gui/qt4/components/interface_widgets.cpp

@@ -373 +373 @@
-        i_input_id = p_item->i_id;
-
-
-
-
-
+
-    }
-    else
+    {
-        recordButton->setVisible( false );
+    }
-
-    ABButton->setEnabled( enable );
@@ -465 +464 @@
-    {
-        /* This method won't work fine if the stream can't be cut anywhere */
-if( var_Type( p_input, "record-toggle" ) == VLC_VAR_VOID )
-    var_TriggerCallback( p_input, "record-toggle"
+const bool b_recording = var_GetBool( p_input, "record" );
+var_SetBool( p_input, "record", !b_recording
-#if 0
-        else

src/input/control.c

@@ -64 +64 @@
-
-    int i_int, *pi_int;
+    bool b_bool, *pb_bool;
-    double f, *pf;
-    int64_t i_64, *pi_64;
@@ -599 +600 @@
-        }
-
+        case INPUT_SET_RECORD_STATE:
+            b_bool = (bool)va_arg( args, int );
+            var_SetBool( p_input, "record", b_bool );
+            return VLC_SUCCESS;
+
+        case INPUT_GET_RECORD_STATE:
+            pb_bool = (bool*)va_arg( args, bool* );
+            *pb_bool = var_GetBool( p_input, "record" );
+            return VLC_SUCCESS;
-
-        default:

src/input/decoder.c

@@ -735 +735 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    int i;
-
-    input_thread_t * p_input = p_dec->p_owner->p_input;
-    vout_thread_t * p_vout = p_dec->p_owner->p_vout;
-    input_thread_private_t * p_priv = p_input->p;
-
-    /* Enable with --auto-adjust-pts-delay */
-
+
+
-
-    for( i = 0; i < I_RENDERPICTURES; i++ )
-    {
-
-
+
+
+
-            continue;
-
-oldest_pict || pic->date < oldest_pict
-oldest_pict = 
-youngest_pict || pic->date > youngest_pict
-youngest_pict = 
-
-
-youngest_pict || !oldest_pict
+p_old || p_pic->date < p_old
+p_old = p_
+p_young || p_pic->date > p_young
+p_young = p_
+
+
+p_young || !p_old
-        return;
-
@@ -776 +777 @@
-     * why we may end up in having a negative pts_delay,
-     * to compensate that artificial delay. */
-mtime_t buffer_size = youngest_pict->date - oldest_pict
-
-buffer_size
+const mtime_t i_buffer_length = p_young->date - p_old
+i_
+i_buffer_length
-    {
-        if( p_priv->pts_adjust.i_num_faulty > 10 )
-        {
-
+i_
-            p_priv->pts_adjust.i_num_faulty = 0;
-        }
-
-
-to_high = !p_priv->pts_adjust.
+b_
+
+b_to_high = !p_priv->pts_adjust.b_
-            p_priv->pts_adjust.i_num_faulty = 0;
-        }
-        p_priv->pts_adjust.i_num_faulty++;
-    }
-buffer_size
+i_buffer_length
-    {
-        if( p_priv->pts_adjust.i_num_faulty > 25 )
-        {
-pts_slide = -buffer_size
+i_pts_slide = -i_buffer_length
-            p_priv->pts_adjust.i_num_faulty = 0;
-        }
-
-
-to_high = !p_priv->pts_adjust.
+b_
+
+b_to_high = !p_priv->pts_adjust.b_
-            p_priv->pts_adjust.i_num_faulty = 0;
-        }
-        p_priv->pts_adjust.i_num_faulty++;
-    }
-pts_slide
-
-mtime_t origi_delay
-
-
+i_pts_slide != 0
+
+const mtime_t i_pts_delay_org
+
+i_
-
-        /* Don't play with the pts delay for more than -2<->3sec */
@@ -817 +818 @@
-        else if( p_input->i_pts_delay > 3000000 )
-            p_input->i_pts_delay = 3000000;
-pts_slide = p_input->i_pts_delay - origi_delay
+i_pts_slide = p_input->i_pts_delay - i_pts_delay_org
-
-        msg_Dbg( p_input, "Sliding the pts by %dms pts delay at %dms picture buffer was %dms",
-pts_slide/1000, (int)p_input->i_pts_delay/1000, (int)buffer_size
+i_pts_slide/1000, (int)p_input->i_pts_delay/1000, (int)i_buffer_length
-
-        vlc_mutex_lock( &p_vout->picture_lock );
-        /* Slide all the picture */
-        for( i = 0; i < I_RENDERPICTURES; i++ )
-
+i_
-        /* FIXME: slide aout/spu */
-        vlc_mutex_unlock( &p_vout->picture_lock );
-
-    }
-}
@@ -873 +873 @@
-        vout_DatePicture( p_vout, p_pic, p_pic->date );
-
-optimize_video_pts
+DecoderOptimizePtsDelay
-
-        vout_DisplayPicture( p_vout, p_pic );

src/input/demux.c

@@ -281 +281 @@
-        case DEMUX_SET_GROUP:
-        case DEMUX_GET_ATTACHMENTS:
+        case DEMUX_CAN_RECORD:
+        case DEMUX_SET_RECORD_STATE:
-            return VLC_EGENERIC;
-
@@ -527 +529 @@
-        case STREAM_CONTROL_ACCESS:
-        case STREAM_GET_CONTENT_TYPE:
+        case STREAM_SET_RECORD_STATE:
-            return VLC_EGENERIC;
-

src/input/input.c

@@ -113 +113 @@
- *    or not, for that check position != 0.0)
- *  - can-pause
+ *  - can-record (if a stream can be recorded while playing)
- *  - teletext-es to get the index of spu track that is teletext --1 if no teletext)
- * * For intf callback upon changes
@@ -185 +186 @@
-    p_input->i_state = INIT_S;
-    p_input->p->i_rate  = INPUT_RATE_DEFAULT;
+    p_input->p->b_recording = false;
-    TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark );
-    TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
@@ -236 +238 @@
-    input_ControlVarInit( p_input );
-
+    /* */
+    p_input->p->pts_adjust.b_auto_adjust = var_GetBool( p_input, "auto-adjust-pts-delay" );
-    p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
-
@@ -1453 +1457 @@
-        {
-            double f_pos;
+
+            if( p_input->p->b_recording )
+            {
+                msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) ignored while recording" );
+                break;
+            }
-            if( i_type == INPUT_CONTROL_SET_POSITION )
-            {
@@ -1489 +1499 @@
-            int64_t i_time;
-            int i_ret;
+
+            if( p_input->p->b_recording )
+            {
+                msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) ignored while recording" );
+                break;
+            }
-
-            if( i_type == INPUT_CONTROL_SET_TIME )
@@ -1745 +1761 @@
-        case INPUT_CONTROL_SET_TITLE_NEXT:
-        case INPUT_CONTROL_SET_TITLE_PREV:
+            if( p_input->p->b_recording )
+            {
+                msg_Err( p_input, "INPUT_CONTROL_SET_TITLE(*) ignored while recording" );
+                break;
+            }
-            if( p_input->p->input.b_title_demux &&
-                p_input->p->input.i_title > 0 )
@@ -1792 +1813 @@
-        case INPUT_CONTROL_SET_SEEKPOINT_NEXT:
-        case INPUT_CONTROL_SET_SEEKPOINT_PREV:
+            if( p_input->p->b_recording )
+            {
+                msg_Err( p_input, "INPUT_CONTROL_SET_SEEKPOINT(*) ignored while recording" );
+                break;
+            }
+
-            if( p_input->p->input.b_title_demux &&
-                p_input->p->input.i_title > 0 )
@@ -1919 +1946 @@
-            break;
-
+        case INPUT_CONTROL_SET_RECORD_STATE:
+            if( p_input->p->input.b_can_record )
+            {
+                if( !!p_input->p->b_recording != !!val.b_bool )
+                {
+                    if( demux_Control( p_input->p->input.p_demux,
+                                       DEMUX_SET_RECORD_STATE, val.b_bool ) )
+                        val.b_bool = false;
+
+                    p_input->p->b_recording = val.b_bool;
+                }
+
+                var_Change( p_input, "record", VLC_VAR_SETVALUE, &val, NULL );
+
+                b_force_update = true;
+            }
+            break;
+
-        case INPUT_CONTROL_SET_BOOKMARK:
-        default:
@@ -2057 +2102 @@
-static input_source_t *InputSourceNew( input_thread_t *p_input )
-{
-(void)p_input
-(input_source_t*) 
+VLC_UNUSED(p_input)
+
-    if( in )
-        memset( in, 0, sizeof( input_source_t ) );
@@ -2320 +2365 @@
-            goto error;
-        }
+
+        if( demux_Control( in->p_demux, DEMUX_CAN_RECORD, &in->b_can_record ) )
+            in->b_can_record = false;
+        var_SetBool( p_input, "can-record", in->b_can_record );
-
-        /* Get title from demux */

src/input/input_internal.h

@@ -64 +64 @@
-    bool b_can_pace_control;
-    bool b_can_rate_control;
+    bool b_can_record;
-    bool b_rescale_ts;
-
@@ -85 +86 @@
-
-    int         i_rate;
+    bool        b_recording;
-    /* */
-    int64_t     i_start;    /* :start-time,0 by default */
@@ -117 +119 @@
-
-    /* pts delay fixup */
-
+
+
-        int  i_num_faulty;
-
-
+b_
+b_
-    } pts_adjust;
-
@@ -192 +195 @@
-
-    INPUT_CONTROL_ADD_SLAVE,
+
+    INPUT_CONTROL_SET_RECORD_STATE,
-};
-

src/input/stream.c

@@ -26 +26 @@
-#endif
-
+#include <dirent.h>
+
-#include <vlc_common.h>
+#include <vlc_charset.h>
+#include <vlc_strings.h>
+#include <vlc_osd.h>
-
-#include <assert.h>
@@ -187 +192 @@
-    /* Preparse mode ? */
-    bool      b_quick;
+
+    /* */
+    struct
+    {
+        bool b_active;
+
+        FILE *f;    /* TODO it could be replaced by access_output_t one day */
+    } record;
-};
-
@@ -213 +226 @@
-static void UStreamDestroy( stream_t *s );
-static int  ASeek( stream_t *s, int64_t i_pos );
+static int  ARecordSetState( stream_t *s, bool b_record, const char *psz_extension );
+static void ARecordWrite( stream_t *s, const uint8_t *p_buffer, size_t i_buffer );
-
-/****************************************************************************
@@ -315 +330 @@
-        p_sys->method = Stream;
-
+    p_sys->record.b_active = false;
+
-    p_sys->i_pos = p_access->info.i_pos;
-
@@ -513 +530 @@
-    vlc_object_detach( s );
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    free( p_sys->p_peek );
@@ -618 +641 @@
-
-    bool *p_bool;
+    bool b_bool;
+    const char *psz_string;
-    int64_t    *pi_64, i_64;
-    int        i_int;
@@ -678 +703 @@
-            return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
-                                    va_arg( args, char ** ) );
+        case STREAM_SET_RECORD_STATE:
+            b_bool = (bool)va_arg( args, int );
+            psz_string = NULL;
+            if( b_bool )
+                psz_string = (const char*)va_arg( args, const char* );
+            return ARecordSetState( s, b_bool, psz_string );
-
-        default:
@@ -686 +717 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/****************************************************************************
@@ -822 +966 @@
-    }
-
+    if( p_sys->record.b_active && i_data > 0 )
+        ARecordWrite( s, p_read, i_data );
+
-    p_sys->i_pos += i_data;
-    return i_data;
@@ -1165 +1312 @@
-        }
-    }
+
+    if( p_sys->record.b_active && i_data > 0 )
+        ARecordWrite( s, p_read, i_data );
-
-    return i_data;
@@ -1552 +1702 @@
-        }
-    }
+
+    if( p_sys->record.b_active && i_copy > 0 )
+        ARecordWrite( s, p_read, i_copy );
-
-    p_sys->i_pos += i_to_read;

src/input/var.c

@@ -62 +62 @@
-                             vlc_value_t oldval, vlc_value_t newval, void * );
-
+static int RecordCallback( vlc_object_t *p_this, char const *psz_cmd,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data );
+
-typedef struct
-{
@@ -94 +98 @@
-    CALLBACK( "audio-es", ESCallback ),
-    CALLBACK( "spu-es", ESCallback ),
+    CALLBACK( "record", RecordCallback ),
-
-    CALLBACK( NULL, NULL )
@@ -189 +194 @@
-    val.i_time = 0;
-    var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
-
-    p_input->p->pts_adjust.auto_adjust = var_CreateGetBool(
-            p_input, "auto-adjust-pts-delay" );
-
-    /* Video ES */
@@ -405 +407 @@
-void input_ConfigVarInit ( input_thread_t *p_input )
-{
-    vlc_value_t val;
-
-    /* Create Object Variables for private use only */
-
@@ -461 +461 @@
-        var_Create( p_input, "clock-synchro",
-                    VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
+        var_Create( p_input, "auto-adjust-pts-delay",
+                    VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
-    }
-
-    var_Create( p_input, "seekable", VLC_VAR_BOOL );
-l.b_bool = true
-
+r_SetBool( p_input, "seekable", true )
+
-    var_Create( p_input, "can-pause", VLC_VAR_BOOL );
-
-
+
+
+
+
+
+
+
+
-    var_Create( p_input, "teletext-es", VLC_VAR_INTEGER );
-    var_SetInteger( p_input, "teletext-es", -1 );
@@ -777 +785 @@
-    return VLC_SUCCESS;
-}
+
+static int RecordCallback( vlc_object_t *p_this, char const *psz_cmd,
+                           vlc_value_t oldval, vlc_value_t newval,
+                           void *p_data )
+{
+    input_thread_t *p_input = (input_thread_t*)p_this;
+    VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
+
+    input_ControlPush( p_input, INPUT_CONTROL_SET_RECORD_STATE, &newval );
+
+    return VLC_SUCCESS;
+}

src/libvlc-module.c

@@ -676 +676 @@
-    "bytes=optional-byte-offset},{...}\"")
-
+#define INPUT_RECORD_PATH_TEXT N_("Record directory or filename")
+#define INPUT_RECORD_PATH_LONGTEXT N_( \
+    "Directory or filename where the records will be stored" )
+
-// DEPRECATED
-#define SUB_CAT_LONGTEXT N_( \
@@ -1737 +1741 @@
-    add_bool( "network-synchronisation", false, NULL, NETSYNC_TEXT,
-              NETSYNC_LONGTEXT, true );
+
+    add_string( "input-record-path", NULL, NULL, INPUT_RECORD_PATH_TEXT,
+                INPUT_RECORD_PATH_LONGTEXT, true );
-
-/* Decoder options */