* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_codecs.h>
"playing MJPEG from a file. Use 0 (this is the default value) for a " \
"live stream (from a camera).")
-vlc_module_begin();
- set_shortname( "MJPEG");
- set_description( _("M-JPEG camera demuxer") );
- set_capability( "demux2", 5 );
- set_callbacks( Open, Close );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE );
- change_safe();
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "MJPEG")
+ set_description( N_("M-JPEG camera demuxer") )
+ set_capability( "demux", 5 )
+ set_callbacks( Open, Close )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, false )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
es_format_t fmt;
es_out_id_t *p_es;
- vlc_bool_t b_still;
+ bool b_still;
mtime_t i_still_end;
mtime_t i_still_length;
int i_frame_size_estimate;
const uint8_t *p_peek;
int i_data_peeked;
+ int i_level;
};
/*****************************************************************************
* Peek: Helper function to peek data with incremental size.
- * \return VLC_FALSE if peek no more data, VLC_TRUE otherwise.
+ * \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;
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;
}
/*****************************************************************************
while( *p_pos > p_sys->i_data_peeked )
{
- if( ! Peek( p_demux, VLC_FALSE ) )
+ if( ! Peek( p_demux, false ) )
{
return NULL;
}
i++;
if( i == i_size )
{
- if( ! Peek( p_demux, VLC_FALSE ) )
+ if( ! Peek( p_demux, false ) )
{
return NULL;
}
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, (char*)p_buf, i );
p_line[i] = '\0';
// msg_Dbg( p_demux, "i = %d, pos = %d, %s", i, *p_pos, p_line );
* 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( (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 );
{
msg_Err( p_demux, "no EOL" );
*p_header_size = -3;
- return VLC_FALSE;
+ return false;
}
/* Read the separator and remember it if not yet stored */
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_Err( p_demux, "no EOL" );
*p_header_size = -3;
- return VLC_FALSE;
+ return false;
}
free( psz_line );
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;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_sys->p_es = NULL;
p_sys->i_time = 0;
+ p_sys->i_level = 0;
p_sys->psz_separator = NULL;
p_sys->i_frame_size_estimate = 15 * 1024;
{
msg_Dbg( p_demux, "JPEG SOI marker detected" );
p_demux->pf_demux = MjpgDemux;
+ p_sys->i_level++;
}
else
{
p_sys->i_frame_length = 0;
/* Check for jpeg file extension */
- p_sys->b_still = VLC_FALSE;
+ p_sys->b_still = false;
p_sys->i_still_end = 0;
- if( demux2_IsPathExtension( p_demux, ".jpeg" ) ||
- demux2_IsPathExtension( p_demux, ".jpg" ) )
+ if( demux_IsPathExtension( p_demux, ".jpeg" ) ||
+ demux_IsPathExtension( p_demux, ".jpg" ) )
{
- p_sys->b_still = VLC_TRUE;
+ p_sys->b_still = true;
if( val.f_float)
{
- p_sys->i_still_length =1000000.0 / val.f_float;
+ p_sys->i_still_length = 1000000.0 / val.f_float;
}
else
{
demux_sys_t *p_sys = p_demux->p_sys;
int i;
- if( p_sys->b_still && p_sys->i_still_end && p_sys->i_still_end < mdate() )
+ if( p_sys->b_still && p_sys->i_still_end )
{
/* Still frame, wait until the pause delay is gone */
+ mwait( p_sys->i_still_end );
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;
return 0;
}
i = 3;
+FIND_NEXT_EOI:
while( !( 0xFF == p_sys->p_peek[i-1] && 0xD9 == p_sys->p_peek[i] ) )
{
+ if( 0xFF == p_sys->p_peek[i-1] && 0xD8 == p_sys->p_peek[i] )
+ {
+ p_sys->i_level++;
+ msg_Dbg( p_demux, "we found another JPEG SOI at %d", i );
+ }
i++;
if( i >= p_sys->i_data_peeked )
{
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" );
return 0;
i++;
msg_Dbg( p_demux, "JPEG EOI detected at %d", i );
+ p_sys->i_level--;
+
+ if( p_sys->i_level > 0 )
+ goto FIND_NEXT_EOI;
return SendBlock( p_demux, i );
}
{
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 );
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 )
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] == '-' ) )
{
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 "
"moment" );
}
}
}
+
if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2),
strlen( p_sys->psz_separator ) ) )
{
- b_done = VLC_TRUE;
- }
- else
- {
- i++;
- i_size++;
+ break;
}
+
+ i++;
+ i_size++;
}
if( !b_match )
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 );
}
*****************************************************************************/
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 );
}