a mime multipart jpeg muxer. Mimics the way some webcams work. Resulting

streams, served in http, are directly playable by mozilla (though
horribly slow)

diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index 8abee45a6d2fb7523dbb23122659e7436e4e412c..6c7ced9d4c3834595b29155d548401a51aa47a10 100644 (file)
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -4,3 +4,4 @@ SOURCES_mux_ogg = ogg.c
 SOURCES_mux_mp4 = mp4.c
 SOURCES_mux_asf = asf.c
 SOURCES_mux_wav = wav.c
+SOURCES_mux_mpjpeg = mpjpeg.c

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
new file mode 100644 (file)
index 0000000..8084b79
--- /dev/null
+++ b/modules/mux/mpjpeg.c
@@ -0,0 +1,146 @@
+/*****************************************************************************
+ * mpjpeg.c: mime multipart jpeg  muxer module for vlc
+ *****************************************************************************
+ * Copyright (C) 2001, 2002 VideoLAN
+ * $Id: dummy.c 7047 2004-03-11 17:37:50Z fenrir $
+ *
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>
+
+#include <vlc/vlc.h>
+#include <vlc/sout.h>
+
+#define SEPARATOR "\n--This Random String\n" \
+                  "Content-Type: image/jpeg\n\n"
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int  Open   ( vlc_object_t * );
+static void Close  ( vlc_object_t * );
+
+vlc_module_begin();
+    set_description( _("Multipart jpeg muxer") );
+    set_capability( "sout mux", 5 );
+    set_callbacks( Open, Close );
+    add_shortcut( "mpjpeg" );
+vlc_module_end();
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static int  Capability(sout_mux_t *, int, void *, void * );
+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
+{
+    block_t *p_separator;
+    vlc_bool_t b_send_headers;
+};
+
+/*****************************************************************************
+ * Open:
+ *****************************************************************************/
+static int Open( vlc_object_t *p_this )
+{
+    sout_mux_t *p_mux = (sout_mux_t*)p_this;
+    sout_mux_sys_t  *p_sys;
+
+    msg_Dbg( p_mux, "Multipart jpeg muxer opened" );
+
+    p_mux->pf_capacity  = Capability;
+    p_mux->pf_addstream = AddStream;
+    p_mux->pf_delstream = DelStream;
+    p_mux->pf_mux       = Mux;
+
+    p_sys = p_mux->p_sys = malloc( sizeof(sout_mux_sys_t) );
+    p_sys->b_send_headers = VLC_TRUE;
+    p_sys->p_separator = block_New( p_mux, sizeof(SEPARATOR) - 1 );
+    memcpy( p_sys->p_separator->p_buffer, SEPARATOR, sizeof(SEPARATOR) - 1 );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close:
+ *****************************************************************************/
+
+static void Close( vlc_object_t * p_this )
+{
+    sout_mux_t *p_mux = (sout_mux_t*)p_this;
+    sout_mux_sys_t *p_sys = p_mux->p_sys;
+
+    msg_Dbg( p_mux, "Multipart jpeg muxer closed" );
+    block_Release( p_sys->p_separator );
+    free( p_sys );
+}
+
+static int Capability( sout_mux_t *p_mux, int i_query,
+                       void *p_args, void *p_answer )
+{
+    return SOUT_MUX_CAP_ERR_UNIMPLEMENTED;
+}
+
+static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+    msg_Dbg( p_mux, "adding input" );
+    if( p_input->p_fmt->i_codec != VLC_FOURCC('M','J','P','G') )
+    {
+        return VLC_EGENERIC;
+    }
+    return VLC_SUCCESS;
+}
+
+static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+    msg_Dbg( p_mux, "removing input" );
+    return VLC_SUCCESS;
+}
+
+static int Mux( sout_mux_t *p_mux )
+{
+    block_fifo_t *p_fifo;
+    sout_mux_sys_t *p_sys = p_mux->p_sys;
+    int i_count;
+    if( p_sys->b_send_headers )
+    {
+        block_t *p_header = block_New( p_mux, sizeof(SEPARATOR) - 2);
+        memcpy( p_header->p_buffer, &SEPARATOR[1], sizeof(SEPARATOR) - 2 );
+        p_header->i_flags |= BLOCK_FLAG_HEADER;
+        sout_AccessOutWrite( p_mux->p_access, p_header );
+        p_sys->b_send_headers = VLC_FALSE;
+    }
+    p_fifo = p_mux->pp_inputs[0]->p_fifo;
+    i_count = p_fifo->i_depth;
+    while( i_count > 0 )
+    {
+        block_t *p_data = block_FifoGet( p_fifo );
+        sout_AccessOutWrite( p_mux->p_access,
+                             block_Duplicate( p_sys->p_separator ) );
+        sout_AccessOutWrite( p_mux->p_access, p_data );
+
+        i_count--;
+    }
+
+    return VLC_SUCCESS;
+}