X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmjpeg.c;h=f601d92899492c91fd4868f18d158d5033134a98;hb=98e9da7b1a9f9d4475189985ad21b1aad0c1d550;hp=a54ac395b67bfc6c78d160635112f33a3bb5b567;hpb=782abd5e3e40e09dfb49f911ee355a130e00afc6;p=vlc diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c index a54ac395b6..f601d92899 100644 --- a/modules/demux/mjpeg.c +++ b/modules/demux/mjpeg.c @@ -1,8 +1,8 @@ /***************************************************************************** * mjpeg.c : demuxes mjpeg webcam http streams ***************************************************************************** - * Copyright (C) 2004 VideoLAN - * $Id: mjpeg.c 7196 2004-03-29 21:29:31Z fenrir $ + * Copyright (C) 2004 the VideoLAN team + * $Id$ * * Authors: Henry Jen (slowhog) * Derk-Jan Hartman (thedj) @@ -21,18 +21,22 @@ * * 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 /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include + +#include /***************************************************************************** * Module descriptor @@ -41,14 +45,18 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); #define FPS_TEXT N_("Frames per Second") -#define FPS_LONGTEXT N_("Allows you to set the desired frame rate when " \ - "playing from files, use 0 for live.") +#define FPS_LONGTEXT N_("This is the desired frame rate when " \ + "playing MJPEG from a file. Use 0 (this is the default value) for a " \ + "live stream (from a camera).") vlc_module_begin(); - set_description( _("JPEG camera demuxer") ); - set_capability( "demux2", 5 ); + set_shortname( "MJPEG"); + set_description( N_("M-JPEG camera demuxer") ); + set_capability( "demux", 5 ); set_callbacks( Open, Close ); - add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, false ); vlc_module_end(); /***************************************************************************** @@ -63,19 +71,23 @@ struct demux_sys_t es_format_t fmt; es_out_id_t *p_es; + bool b_still; + mtime_t i_still_end; + mtime_t i_still_length; + mtime_t i_time; mtime_t i_frame_length; char *psz_separator; int i_frame_size_estimate; - uint8_t *p_peek; + const uint8_t *p_peek; int i_data_peeked; }; /***************************************************************************** - * Peek: Helper function to peek data with incremental size. - * \return VLC_FALSE if peek no more data, VLC_TRUE otherwise. + * Peek: Helper function to peek data with incremental size. + * \return false if peek no more data, true otherwise. *****************************************************************************/ -static vlc_bool_t Peek( demux_t *p_demux, vlc_bool_t b_first ) +static bool Peek( demux_t *p_demux, bool b_first ) { int i_data; demux_sys_t *p_sys = p_demux->p_sys; @@ -93,15 +105,15 @@ static vlc_bool_t Peek( demux_t *p_demux, vlc_bool_t b_first ) if( i_data == p_sys->i_data_peeked ) { msg_Warn( p_demux, "no more data" ); - return VLC_FALSE; + return false; } p_sys->i_data_peeked = i_data; if( i_data <= 0 ) { msg_Warn( p_demux, "cannot peek data" ); - return VLC_FALSE; + return false; } - return VLC_TRUE; + return true; } /***************************************************************************** @@ -110,14 +122,14 @@ static vlc_bool_t Peek( demux_t *p_demux, vlc_bool_t b_first ) static char* GetLine( demux_t *p_demux, int *p_pos ) { demux_sys_t *p_sys = p_demux->p_sys; - uint8_t *p_buf; + const uint8_t *p_buf; int i_size; int i; char *p_line; while( *p_pos > p_sys->i_data_peeked ) { - if( ! Peek( p_demux, VLC_FALSE ) ) + if( ! Peek( p_demux, false ) ) { return NULL; } @@ -130,7 +142,7 @@ static char* GetLine( demux_t *p_demux, int *p_pos ) i++; if( i == i_size ) { - if( ! Peek( p_demux, VLC_FALSE ) ) + if( ! Peek( p_demux, false ) ) { return NULL; } @@ -144,12 +156,9 @@ static char* GetLine( demux_t *p_demux, int *p_pos ) i--; } p_line = malloc( i + 1 ); - if( NULL == p_line ) - { - msg_Err( p_demux, "out of memory" ); + if( p_line == NULL ) return NULL; - } - strncpy ( p_line, p_buf, i ); + strncpy ( p_line, (char*)p_buf, i ); p_line[i] = '\0'; // msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line ); return p_line; @@ -159,32 +168,32 @@ static char* GetLine( demux_t *p_demux, int *p_pos ) * CheckMimeHeader: Internal function used to verify and skip mime header * \param p_header_size Return size of MIME header, 0 if no MIME header * detected, minus value if error - * \return VLC_TRUE if content type is image/jpeg, VLC_FALSE otherwise + * \return true if content type is image/jpeg, false otherwise *****************************************************************************/ -static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size ) +static bool CheckMimeHeader( demux_t *p_demux, int *p_header_size ) { - vlc_bool_t b_jpeg = VLC_FALSE; + bool b_jpeg = false; int i_pos; char *psz_line; char *p_ch; demux_sys_t *p_sys = p_demux->p_sys; - if( !Peek( p_demux, VLC_TRUE ) ) + if( !Peek( p_demux, true ) ) { msg_Err( p_demux, "cannot peek" ); *p_header_size = -1; - return VLC_FALSE; + return false; } if( p_sys->i_data_peeked < 3) { msg_Err( p_demux, "data shortage" ); *p_header_size = -2; - return VLC_FALSE; + return false; } - if( strncmp( p_sys->p_peek, "--", 2 ) ) + if( strncmp( (char *)p_sys->p_peek, "--", 2 ) ) { *p_header_size = 0; - return VLC_FALSE; + return false; } i_pos = 2; psz_line = GetLine( p_demux, &i_pos ); @@ -192,9 +201,11 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size ) { msg_Err( p_demux, "no EOL" ); *p_header_size = -3; - return VLC_FALSE; + return false; } - if( NULL == p_sys->psz_separator ) + + /* Read the separator and remember it if not yet stored */ + if( p_sys->psz_separator == NULL ) { p_sys->psz_separator = psz_line; msg_Dbg( p_demux, "Multipart MIME detected, using separator: %s", @@ -209,10 +220,10 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size ) } free( psz_line ); } + psz_line = GetLine( p_demux, &i_pos ); while( psz_line && *psz_line ) { - msg_Dbg( p_demux, "%s", psz_line ); if( !strncasecmp( psz_line, "Content-Type:", 13 ) ) { p_ch = psz_line + 13; @@ -220,26 +231,30 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size ) if( strncasecmp( p_ch, "image/jpeg", 10 ) ) { msg_Warn( p_demux, "%s, image/jpeg is expected", psz_line ); - b_jpeg = VLC_FALSE; + b_jpeg = false; } else { - b_jpeg = VLC_TRUE; + b_jpeg = true; } } else { - msg_Dbg( p_demux, "Discard MIME header: %s", psz_line ); + msg_Dbg( p_demux, "discard MIME header: %s", psz_line ); } free( psz_line ); psz_line = GetLine( p_demux, &i_pos ); } + if( NULL == psz_line ) { msg_Err( p_demux, "no EOL" ); *p_header_size = -3; - return VLC_FALSE; + return false; } + + free( psz_line ); + *p_header_size = i_pos; return b_jpeg; } @@ -268,6 +283,12 @@ static int SendBlock( demux_t *p_demux, int i ) /* set PCR */ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); es_out_Send( p_demux->out, p_sys->p_es, p_block ); + + if( p_sys->b_still ) + { + p_sys->i_still_end = mdate() + p_sys->i_still_length; + } + return 1; } @@ -279,7 +300,7 @@ static int Open( vlc_object_t * p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; int i_size; - int b_matched = VLC_FALSE; + int b_matched = false; vlc_value_t val; p_demux->pf_control = Control; @@ -287,14 +308,6 @@ static int Open( vlc_object_t * p_this ) p_sys->p_es = NULL; p_sys->i_time = 0; - var_Create( p_demux, "mjpeg-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); - var_Get( p_demux, "mjpeg-fps", &val ); - p_sys->i_frame_length = 0; - if( val.f_float ) - { - p_sys->i_frame_length = 1000000.0 / val.f_float; - } - p_sys->psz_separator = NULL; p_sys->i_frame_size_estimate = 15 * 1024; @@ -322,6 +335,33 @@ static int Open( vlc_object_t * p_this ) goto error; } + + var_Create( p_demux, "mjpeg-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + var_Get( p_demux, "mjpeg-fps", &val ); + p_sys->i_frame_length = 0; + + /* Check for jpeg file extension */ + p_sys->b_still = false; + p_sys->i_still_end = 0; + if( demux_IsPathExtension( p_demux, ".jpeg" ) || + demux_IsPathExtension( p_demux, ".jpg" ) ) + { + p_sys->b_still = true; + if( val.f_float) + { + p_sys->i_still_length = 1000000.0 / val.f_float; + } + else + { + /* Defaults to 1fps */ + p_sys->i_still_length = 1000000; + } + } + else if ( val.f_float ) + { + p_sys->i_frame_length = 1000000.0 / val.f_float; + } + es_format_Init( &p_sys->fmt, VIDEO_ES, 0 ); p_sys->fmt.i_codec = VLC_FOURCC('m','j','p','g'); @@ -329,7 +369,6 @@ static int Open( vlc_object_t * p_this ) return VLC_SUCCESS; error: - msg_Warn( p_demux, "JPEG camera module discarded" ); free( p_sys ); return VLC_EGENERIC; } @@ -342,9 +381,20 @@ error: static int MjpgDemux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - int i; + int i; + + if( p_sys->b_still && p_sys->i_still_end && p_sys->i_still_end < mdate() ) + { + /* Still frame, wait until the pause delay is gone */ + p_sys->i_still_end = 0; + } + else if( p_sys->b_still && p_sys->i_still_end ) + { + msleep( 400 ); + return 1; + } - if( !Peek( p_demux, VLC_TRUE ) ) + if( !Peek( p_demux, true ) ) { msg_Warn( p_demux, "cannot peek data" ); return 0; @@ -360,16 +410,17 @@ static int MjpgDemux( demux_t *p_demux ) i++; if( i >= p_sys->i_data_peeked ) { - msg_Dbg( p_demux, "Did not find JPEG EOI in %d bytes", + msg_Dbg( p_demux, "did not find JPEG EOI in %d bytes", p_sys->i_data_peeked ); - if( !Peek( p_demux, VLC_FALSE ) ) + if( !Peek( p_demux, false ) ) { - msg_Warn( p_demux, "No more data is available at the moment" ); + msg_Warn( p_demux, "no more data is available at the moment" ); return 0; } } } i++; + msg_Dbg( p_demux, "JPEG EOI detected at %d", i ); return SendBlock( p_demux, i ); } @@ -378,10 +429,9 @@ static int MimeDemux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; int i_size, i; - vlc_bool_t b_match; - vlc_bool_t b_done; - b_match = CheckMimeHeader( p_demux, &i_size ); + bool b_match = CheckMimeHeader( p_demux, &i_size ); + if( i_size > 0 ) { stream_Read( p_demux->s, NULL, i_size ); @@ -393,14 +443,15 @@ static int MimeDemux( demux_t *p_demux ) else { // No MIME header, assume OK - b_match = VLC_TRUE; + b_match = true; } - if( !Peek( p_demux, VLC_TRUE ) ) + if( !Peek( p_demux, true ) ) { msg_Warn( p_demux, "cannot peek data" ); return 0; } + i = 0; i_size = strlen( p_sys->psz_separator ) + 2; if( p_sys->i_data_peeked < i_size ) @@ -408,8 +459,8 @@ static int MimeDemux( demux_t *p_demux ) msg_Warn( p_demux, "data shortage" ); return 0; } - b_done = VLC_FALSE; - while( !b_done ) + + for( ;; ) { while( !( p_sys->p_peek[i] == '-' && p_sys->p_peek[i+1] == '-' ) ) { @@ -420,32 +471,28 @@ static int MimeDemux( demux_t *p_demux ) msg_Dbg( p_demux, "MIME boundary not found in %d bytes of " "data", p_sys->i_data_peeked ); - if( !Peek( p_demux, VLC_FALSE ) ) + if( !Peek( p_demux, false ) ) { - msg_Warn( p_demux, "No more data is available at the " + msg_Warn( p_demux, "no more data is available at the " "moment" ); return 0; } } } - if( !strncmp( p_sys->psz_separator, p_sys->p_peek + i + 2, + + if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2), strlen( p_sys->psz_separator ) ) ) { - b_done = VLC_TRUE; - msg_Dbg( p_demux, "MIME boundary detected at %d", i ); - } - else - { - i++; - i_size++; - msg_Dbg( p_demux, "not done" ); + break; } + + i++; + i_size++; } - msg_Dbg( p_demux, "i is %d", i ); if( !b_match ) { - msg_Err( p_demux, "Discard non-JPEG part" ); + msg_Err( p_demux, "discard non-JPEG part" ); stream_Read( p_demux->s, NULL, i ); return 0; } @@ -461,10 +508,7 @@ static void Close ( vlc_object_t * p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; - if( p_sys->psz_separator ) - { - free( p_sys->psz_separator ); - } + free( p_sys->psz_separator ); free( p_sys ); } @@ -473,5 +517,5 @@ static void Close ( vlc_object_t * p_this ) *****************************************************************************/ static int Control( demux_t *p_demux, int i_query, va_list args ) { - return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 0, i_query, args ); + return demux_vaControlHelper( p_demux->s, 0, 0, 0, 0, i_query, args ); }