# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_codecs.h>
vlc_module_begin();
set_shortname( "MJPEG");
- set_description( _("M-JPEG camera demuxer") );
+ set_description( N_("M-JPEG camera demuxer") );
set_capability( "demux", 5 );
set_callbacks( Open, Close );
set_category( CAT_INPUT );
int i_frame_size_estimate;
const uint8_t *p_peek;
int i_data_peeked;
+ int i_level;
};
/*****************************************************************************
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 );
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->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;
}
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 )
{
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;
- bool b_match;
- bool 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 );
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 = false;
- while( !b_done )
+
+ for( ;; )
{
while( !( p_sys->p_peek[i] == '-' && p_sys->p_peek[i+1] == '-' ) )
{
}
}
}
+
if( !strncmp( p_sys->psz_separator, (char *)(p_sys->p_peek + i + 2),
strlen( p_sys->psz_separator ) ) )
{
- b_done = true;
- }
- else
- {
- i++;
- i_size++;
+ break;
}
+
+ i++;
+ i_size++;
}
if( !b_match )