/*****************************************************************************
* mpjpeg.c: mime multipart jpeg muxer module for vlc
*****************************************************************************
- * Copyright (C) 2001, 2002, 2006 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
*
- * 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
-#include <vlc_codecs.h>
/*****************************************************************************
* Module descriptor
#define SOUT_CFG_PREFIX "sout-mpjpeg-"
-vlc_module_begin();
- set_shortname( "MPJPEG" );
- set_description( _("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();
+vlc_module_begin ()
+ set_shortname( "MPJPEG" )
+ set_description( N_("Multipart JPEG muxer") )
+ set_capability( "sout mux", 5 )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_MUX )
+ set_callbacks( Open, Close )
+ add_shortcut( "mpjpeg" )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
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 void DelStream( sout_mux_t *, sout_input_t * );
static int Mux ( sout_mux_t * );
/* This pseudo-random sequence is unlikely to ever happen */
}
msg_Dbg( p_mux, "adding input" );
- 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') )
- {
+ if( p_input->p_fmt->i_codec != VLC_CODEC_MJPG )
return VLC_EGENERIC;
- }
return VLC_SUCCESS;
}
-static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
+static void 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_mux_t *p_mux )
static const char psz_hfmt[] = "\r\n"
"--"BOUNDARY"\r\n"
"Content-Type: image/jpeg\r\n"
- "Content-Length: %u\r\n"
+ "Content-Length: %zu\r\n"
"\r\n";
block_t *p_data = block_FifoGet( p_fifo );
- block_t *p_header = block_New( p_mux, sizeof( psz_hfmt ) + 20 );
+ block_t *p_header = block_Alloc( sizeof( psz_hfmt ) + 20 );
if( p_header == NULL ) /* uho! */
{