X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fmpjpeg.c;h=0d53522a5977fde31a1cc9553b116f0e4e86b526;hb=88b1d54a0d3eb0b66aac5b1eb24867bc355d54e1;hp=421ea4b8d24035022ff2455519d628da50d5fc56;hpb=f93b1504d93a524939c114349886ba5fb45a3b35;p=vlc diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c index 421ea4b8d2..0d53522a59 100644 --- a/modules/mux/mpjpeg.c +++ b/modules/mux/mpjpeg.c @@ -1,10 +1,10 @@ /***************************************************************************** * 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 $ + * Copyright (C) 2001, 2002, 2006 the VideoLAN team + * $Id$ * - * Authors: Sigmund Augdal + * Authors: Sigmund Augdal Helberg * * 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 @@ -18,28 +18,37 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include -#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 * ); +#define SOUT_CFG_PREFIX "sout-mpjpeg-" + vlc_module_begin(); - set_description( _("Multipart jpeg muxer") ); + set_shortname( "MPJPEG" ); + set_description( N_("Multipart JPEG muxer") ); set_capability( "sout mux", 5 ); + add_obsolete_string( SOUT_CFG_PREFIX "separator" ); + set_category( CAT_SOUT ); + set_subcategory( SUBCAT_SOUT_MUX ); set_callbacks( Open, Close ); add_shortcut( "mpjpeg" ); vlc_module_end(); @@ -52,11 +61,9 @@ 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; -}; +/* This pseudo-random sequence is unlikely to ever happen */ +/* This should be the same as in src/network/httpd.c */ +#define BOUNDARY "7b3cc56e5f51db803f790dad720ed50a" /***************************************************************************** * Open: @@ -64,7 +71,6 @@ struct sout_mux_sys_t 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" ); @@ -72,11 +78,7 @@ static int Open( vlc_object_t *p_this ) 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 ); + p_mux->p_sys = NULL; return VLC_SUCCESS; } @@ -87,39 +89,37 @@ static int Open( vlc_object_t *p_this ) 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 ); + /* TODO: send the ending boundary ("\r\n--"BOUNDARY"--\r\n"), + * but is the access_output still useable?? */ + msg_Dbg( p_this, "Multipart jpeg muxer closed" ); } static int Control( sout_mux_t *p_mux, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + VLC_UNUSED(p_mux); + bool *pb_bool; char **ppsz; - switch( i_query ) - { - case MUX_CAN_ADD_STREAM_WHILE_MUXING: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; - return VLC_SUCCESS; + 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 = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb_bool = VLC_TRUE; - return VLC_SUCCESS; + case MUX_GET_ADD_STREAM_WAIT: + pb_bool = (bool*)va_arg( args, bool * ); + *pb_bool = true; + return VLC_SUCCESS; - case MUX_GET_MIME: - ppsz = (char**)va_arg( args, char ** ); - *ppsz = strdup( "image/jpeg" ); - return VLC_SUCCESS; + case MUX_GET_MIME: + ppsz = (char**)va_arg( args, char ** ); + *ppsz = strdup( "multipart/x-mixed-replace; boundary="BOUNDARY ); + return VLC_SUCCESS; default: return VLC_EGENERIC; - } + } } static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) @@ -131,7 +131,13 @@ 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') ) + if( p_input->p_fmt->i_codec != VLC_FOURCC('M','J','P','G') && + p_input->p_fmt->i_codec != VLC_FOURCC('m','j','p','g') && + p_input->p_fmt->i_codec != VLC_FOURCC('j','p','e','g') && + p_input->p_fmt->i_codec != VLC_FOURCC('J','P','E','G') && + p_input->p_fmt->i_codec != VLC_FOURCC('J','F','I','F') && + p_input->p_fmt->i_codec != VLC_FOURCC('J','P','G','L') && + p_input->p_fmt->i_codec != VLC_FOURCC('m','j','p','a') ) { return VLC_EGENERIC; } @@ -141,6 +147,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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; } @@ -148,30 +155,33 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) 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; - } if( !p_mux->i_nb_inputs ) return VLC_SUCCESS; p_fifo = p_mux->pp_inputs[0]->p_fifo; - i_count = p_fifo->i_depth; - while( i_count > 0 ) + + while( block_FifoCount( p_fifo ) > 0 ) { + static const char psz_hfmt[] = "\r\n" + "--"BOUNDARY"\r\n" + "Content-Type: image/jpeg\r\n" + "Content-Length: %zu\r\n" + "\r\n"; 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 ); + block_t *p_header = block_New( p_mux, sizeof( psz_hfmt ) + 20 ); - i_count--; + if( p_header == NULL ) /* uho! */ + { + block_Release( p_data ); + continue; + } + + p_header->i_buffer = + snprintf( (char *)p_header->p_buffer, p_header->i_buffer, + psz_hfmt, p_data->i_buffer ); + p_header->i_flags |= BLOCK_FLAG_HEADER; + sout_AccessOutWrite( p_mux->p_access, p_header ); + sout_AccessOutWrite( p_mux->p_access, p_data ); } return VLC_SUCCESS;