]> git.sesse.net Git - vlc/blobdiff - modules/mux/dummy.c
Merge branch 'master' of git://git.videolan.org/vlc
[vlc] / modules / mux / dummy.c
index beb384df6d8b610631edf719ed8245d1fd1772c2..e1eec70061635e1c738ca186171676ed0cc0f9e7 100644 (file)
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * dummy.c
+ * dummy.c: dummy muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: dummy.c,v 1.3 2003/02/24 10:45:55 fenrir Exp $
+ * Copyright (C) 2001, 2002 the VideoLAN team
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
-
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
-#   include <io.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
-#include "codecs.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
 
 /*****************************************************************************
- * Exported prototypes
+ * Module descriptor
  *****************************************************************************/
-static int     Open   ( vlc_object_t * );
-static void    Close  ( vlc_object_t * );
-
-static int AddStream( sout_instance_t *, sout_input_t * );
-static int DelStream( sout_instance_t *, sout_input_t * );
-static int Mux      ( sout_instance_t * );
+static int  Open   ( vlc_object_t * );
+static void Close  ( vlc_object_t * );
+
+vlc_module_begin ()
+    set_description( N_("Dummy/Raw muxer") )
+    set_capability( "sout mux", 5 )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    add_shortcut( "dummy", "raw", "es" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 /*****************************************************************************
- * Module descriptor
+ * Exported prototypes
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("Dummy muxer") );
-    set_capability( "sout mux", 5 );
-    add_shortcut( "dummy" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+static int Control( sout_mux_t *, int, va_list );
+static int AddStream( sout_mux_t *, sout_input_t * );
+static int DelStream( sout_mux_t *, sout_input_t * );
+static int Mux      ( sout_mux_t * );
+
+struct sout_mux_sys_t
+{
+    /* Some streams have special initialization data, we'll output this
+     * data as an header in the stream. */
+    bool b_header;
+};
 
 /*****************************************************************************
  * Open:
  *****************************************************************************/
 static int Open( vlc_object_t *p_this )
 {
-    sout_instance_t     *p_sout = (sout_instance_t*)p_this;
+    sout_mux_t *p_mux = (sout_mux_t*)p_this;
+    sout_mux_sys_t  *p_sys;
+
+    msg_Dbg( p_mux, "Dummy/Raw muxer opened" );
+    msg_Info( p_mux, "Open" );
 
-    msg_Info( p_sout, "Open" );
+    p_mux->pf_control   = Control;
+    p_mux->pf_addstream = AddStream;
+    p_mux->pf_delstream = DelStream;
+    p_mux->pf_mux       = Mux;
 
-    p_sout->pf_mux_capacity  = NULL;
-    p_sout->pf_mux_addstream = AddStream;
-    p_sout->pf_mux_delstream = DelStream;
-    p_sout->pf_mux           = Mux;
+    p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
+    p_sys->b_header      = true;
 
     return VLC_SUCCESS;
 }
@@ -87,46 +95,85 @@ static int Open( vlc_object_t *p_this )
 
 static void Close( vlc_object_t * p_this )
 {
-    sout_instance_t     *p_sout = (sout_instance_t*)p_this;
-    msg_Info( p_sout, "Close" );
-}
+    sout_mux_t *p_mux = (sout_mux_t*)p_this;
+    sout_mux_sys_t *p_sys = p_mux->p_sys;
 
+    msg_Dbg( p_mux, "Dummy/Raw muxer closed" );
+    free( p_sys );
+}
 
-static int AddStream( sout_instance_t *p_sout, sout_input_t *p_input )
+static int Control( sout_mux_t *p_mux, int i_query, va_list args )
 {
-    msg_Dbg( p_sout, "adding input" );
-    return( 0 );
+    VLC_UNUSED(p_mux);
+    bool *pb_bool;
+
+    switch( i_query )
+    {
+        case MUX_CAN_ADD_STREAM_WHILE_MUXING:
+            pb_bool = (bool*)va_arg( args, bool * );
+            *pb_bool = true;
+            return VLC_SUCCESS;
+
+        case MUX_GET_ADD_STREAM_WAIT:
+            pb_bool = (bool*)va_arg( args, bool * );
+            *pb_bool = false;
+            return VLC_SUCCESS;
+
+        case MUX_GET_MIME:   /* Unknown */
+        default:
+            return VLC_EGENERIC;
+   }
 }
 
-static int DelStream( sout_instance_t *p_sout, sout_input_t *p_input )
+static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
 {
+    VLC_UNUSED(p_input);
+    msg_Dbg( p_mux, "adding input" );
+    return VLC_SUCCESS;
+}
 
-    msg_Dbg( p_sout, "removing input" );
-    return( 0 );
+static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+    VLC_UNUSED(p_input);
+    msg_Dbg( p_mux, "removing input" );
+    return VLC_SUCCESS;
 }
 
-static int Mux      ( sout_instance_t *p_sout )
+static int Mux( sout_mux_t *p_mux )
 {
+    sout_mux_sys_t *p_sys = p_mux->p_sys;
     int i;
-    for( i = 0; i < p_sout->i_nb_inputs; i++ )
+
+    for( i = 0; i < p_mux->i_nb_inputs; i++ )
     {
+        block_fifo_t *p_fifo;
         int i_count;
-        sout_fifo_t *p_fifo;
 
-        p_fifo = p_sout->pp_inputs[i]->p_fifo;
-        i_count = p_fifo->i_depth;
-        while( i_count > 0 )
+        if( p_sys->b_header && p_mux->pp_inputs[i]->p_fmt->i_extra )
         {
-            sout_buffer_t *p_data;
+            /* Write header data */
+            block_t *p_data;
+            p_data = block_New( p_mux, p_mux->pp_inputs[i]->p_fmt->i_extra );
+
+            memcpy( p_data->p_buffer, p_mux->pp_inputs[i]->p_fmt->p_extra,
+                    p_mux->pp_inputs[i]->p_fmt->i_extra );
+
+            msg_Dbg( p_mux, "writing header data" );
+            sout_AccessOutWrite( p_mux->p_access, p_data );
+        }
 
-            p_data = sout_FifoGet( p_fifo );
+        p_fifo = p_mux->pp_inputs[i]->p_fifo;
+        i_count = block_FifoCount( p_fifo );
+        while( i_count > 0 )
+        {
+            block_t *p_data = block_FifoGet( p_fifo );
 
-            sout_AccessOutWrite( p_sout->p_access, p_data );
+            sout_AccessOutWrite( p_mux->p_access, p_data );
 
             i_count--;
         }
-
     }
-    return( 0 );
-}
+    p_sys->b_header = false;
 
+    return VLC_SUCCESS;
+}