Changeset e4c110a0805532b60defd19ea23d0c2a47e626cd

Timestamp:

28/06/04 23:36:17 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1088458577 +0000

git-parent:

[d755649277131dd111667db2fb46bf41a375b6df]

git-author:

Laurent Aimar <fenrir@videolan.org> 1088458577 +0000

Message:

• demuxdump: ported to demux2.
  

Files:

• modules/demux/demuxdump.c (modified) (6 diffs)

modules/demux/demuxdump.c

@@ -2 +2 @@
- * demuxdump.c : Pseudo demux module for vlc (dump raw stream)
- *****************************************************************************
-3
-: demuxdump.c,v 1.12 2004/01/25 20:05:28 hartman Exp 
+4
+
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -11 +11 @@
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- 
+
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -32 +32 @@
-#include <vlc/input.h>
-
-#include <sys/types.h>
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int  Activate ( vlc_object_t * );
-static int  Demux ( input_thread_t * );
-static void Deactivate ( vlc_object_t * );
-
-#define DUMP_BLOCKSIZE  16384
-
-/*****************************************************************************
- * Module descriptor
@@ -50 +39 @@
-    "Specify a file name to which the raw stream will be dumped." )
-
+static int  Open( vlc_object_t * );
+static void Close ( vlc_object_t * );
+
-vlc_module_begin();
-    set_description( _("Filedump demuxer") );
-
- 
+2
+
-              FILE_LONGTEXT, VLC_FALSE );
-Activate, Deactivat
+Open, Clos
-    add_shortcut( "dump" );
-vlc_module_end();
-
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Demux( demux_t * );
+static int Control( demux_t *, int,va_list );
+
+#define DUMP_BLOCKSIZE  16384
+
-struct demux_sys_t
-{
-nam
+fil
-    FILE        *p_file;
-    uint64_t    i_write;
-
-void        *p_demux_data_sav
+uint8_t     buffer[DUMP_BLOCKSIZE]
-};
-
@@ -73 +74 @@
-
-/*****************************************************************************
-Activate
+Open
- *****************************************************************************/
-Activate
+Open
-{
-
-
-
-
+
+
-
-Set the demux function
-p_input->pf_demux = Demux;
-p_input->pf_demux_control = demux_vaControlDefault
+Accept only if forced
+if( strcasecmp( p_demux->psz_demux, "dump" ) )
+    return VLC_EGENERIC
-
-
-
+
+
+
+
+
+
+
-    {
-
-
-
-
-
-
-
-
-
-
+
-        return VLC_EGENERIC;
-    }
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        return VLC_EGENERIC;
-    }
-
-
-
-
-
-
-
+
-
-    p_demux->i_write = 0;
-    p_demux->p_demux_data_sav = p_input->p_demux_data;
-
-    if( p_input->stream.p_selected_program != NULL )
-    {
-        /* workaround for dvd access */
-        msg_Warn( p_input, "demux data already initializated (by access?)" );
-    }
-    else
-    {
-
-        if( input_InitStream( p_input, 0 ) == -1 )
-        {
-            if( p_demux->p_file != stdout )
-                fclose( p_demux->p_file );
-            free( p_demux );
-            return VLC_EGENERIC;
-        }
-        input_AddProgram( p_input, 0, 0 );
-        p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-
-        vlc_mutex_lock( &p_input->stream.stream_lock );
-        p_input->stream.p_selected_area->i_tell = 0;
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
-    }
-
-    p_input->p_demux_data = p_demux;
-
-    vlc_mutex_lock( &p_input->stream.stream_lock );
-    p_input->stream.p_selected_program->b_is_ok = 1;
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-    
-    return VLC_SUCCESS;
-}
-
-/*****************************************************************************
-Deactivate: initializes dump structures
+Close:
- *****************************************************************************/
-Deactivate 
+Close
-{
-    input_thread_t      *p_input = (input_thread_t *)p_this;
-    demux_sys_t         *p_demux = (demux_sys_t*)p_input->p_demux_data;
-
-
-
-
-
+
+
-
-
+
+
+
+
-    {
-
-
-
+
-    }
-
-
-
-
-
-
+
+
+
-}
-
@@ -195 +140 @@
- * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
- *****************************************************************************/
-input_thread_t * p_input
+demux_t *p_demux
-{
-        *p_demux = (demux_sys_t*)p_input->p_demux_data
+*p_sys = p_demux->p_sys
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    {
-
+
+
-    }
+    msg_Dbg( p_demux, "dumped %d bytes", i_data );
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
+}
-
-    if( (p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT)
-         | (input_ClockManageControl( p_input, 
-                      p_input->stream.p_selected_program,
-                         (mtime_t)0 ) == PAUSE_S) )
-    {
-        msg_Warn( p_input, "synchro reinit" );
-        p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_OK;
-    }
-
-    return( 1 );
-}