Skip to content

V
vlc-2-2
Commit 381e1674 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/mux/ogg.c: when removing a stream, flush its fifo first.

parent d5c1443a
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 91 deletions
modules/mux/ogg.c
View file @ 381e1674
...@@ -62,6 +62,7 @@ static int Control ( sout_mux_t *, int, va_list ); ...@@ -62,6 +62,7 @@ static int Control ( sout_mux_t *, int, va_list );
static int AddStream( sout_mux_t *, sout_input_t * ); static int AddStream( sout_mux_t *, sout_input_t * );
static int DelStream( sout_mux_t *, sout_input_t * ); static int DelStream( sout_mux_t *, sout_input_t * );
static int Mux ( sout_mux_t * ); static int Mux ( sout_mux_t * );
static int MuxBlock ( sout_mux_t *, sout_input_t * );
static block_t *OggCreateHeader( sout_mux_t *, mtime_t ); static block_t *OggCreateHeader( sout_mux_t *, mtime_t );
static block_t *OggCreateFooter( sout_mux_t *, mtime_t ); static block_t *OggCreateFooter( sout_mux_t *, mtime_t );
...@@ -160,14 +161,8 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts ) ...@@ -160,14 +161,8 @@ static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
else return -1; else return -1;
} }
if( pi_stream ) if( pi_stream ) *pi_stream = i_stream;
{ if( pi_dts ) *pi_dts = i_dts;
*pi_stream = i_stream;
}
if( pi_dts )
{
*pi_dts = i_dts;
}
return i_stream; return i_stream;
} }
...@@ -497,6 +492,11 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input ) ...@@ -497,6 +492,11 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
/* flush all remaining data */ /* flush all remaining data */
if( p_input->p_sys ) if( p_input->p_sys )
{ {
if( !p_stream->b_new )
{
while( p_input->p_fifo->i_depth ) MuxBlock( p_mux, p_input );
}
if( !p_stream->b_new && if( !p_stream->b_new &&
( p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ) ) ) ( p_og = OggStreamFlush( p_mux, &p_stream->os, 0 ) ) )
{ {
...@@ -908,107 +908,105 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -908,107 +908,105 @@ static int Mux( sout_mux_t *p_mux )
for( ;; ) for( ;; )
{ {
sout_input_t *p_input; if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS;
ogg_stream_t *p_stream; MuxBlock( p_mux, p_mux->pp_inputs[i_stream] );
block_t *p_data; }
ogg_packet op;
if( MuxGetStream( p_mux, &i_stream, &i_dts) < 0 ) return VLC_SUCCESS;
{ }
return VLC_SUCCESS;
}
p_input = p_mux->pp_inputs[i_stream]; static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream = (ogg_stream_t*)p_input->p_sys; {
p_data = block_FifoGet( p_input->p_fifo ); sout_mux_sys_t *p_sys = p_mux->p_sys;
ogg_stream_t *p_stream = (ogg_stream_t*)p_input->p_sys;
block_t *p_data = block_FifoGet( p_input->p_fifo );
block_t *p_og = NULL;
ogg_packet op;
if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) && if( p_stream->i_fourcc != VLC_FOURCC( 'v', 'o', 'r', 'b' ) &&
p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) && p_stream->i_fourcc != VLC_FOURCC( 'f', 'l', 'a', 'c' ) &&
p_stream->i_fourcc != VLC_FOURCC( 's', 'p', 'x', ' ' ) && p_stream->i_fourcc != VLC_FOURCC( 's', 'p', 'x', ' ' ) &&
p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) ) p_stream->i_fourcc != VLC_FOURCC( 't', 'h', 'e', 'o' ) )
{ {
p_data = block_Realloc( p_data, 1, p_data->i_buffer ); p_data = block_Realloc( p_data, 1, p_data->i_buffer );
p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME p_data->p_buffer[0] = PACKET_IS_SYNCPOINT; // FIXME
} }
op.packet = p_data->p_buffer; op.packet = p_data->p_buffer;
op.bytes = p_data->i_buffer; op.bytes = p_data->i_buffer;
op.b_o_s = 0; op.b_o_s = 0;
op.e_o_s = 0; op.e_o_s = 0;
op.packetno = p_stream->i_packet_no++; op.packetno = p_stream->i_packet_no++;
if( p_stream->i_cat == AUDIO_ES ) if( p_stream->i_cat == AUDIO_ES )
{
if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) ||
p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) ||
p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
{ {
if( p_stream->i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) || /* number of sample from begining + current packet */
p_stream->i_fourcc == VLC_FOURCC( 'f', 'l', 'a', 'c' ) || op.granulepos =
p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) ( p_data->i_dts - p_sys->i_start_dts + p_data->i_length ) *
{ (mtime_t)p_input->p_fmt->audio.i_rate / I64C(1000000);
/* number of sample from begining + current packet */
op.granulepos =
( i_dts - p_sys->i_start_dts + p_data->i_length ) *
(mtime_t)p_input->p_fmt->audio.i_rate / I64C(1000000);
}
else if( p_stream->p_oggds_header )
{
/* number of sample from begining */
op.granulepos = ( i_dts - p_sys->i_start_dts ) *
p_stream->p_oggds_header->i_samples_per_unit /
I64C(1000000);
}
} }
else if( p_stream->i_cat == VIDEO_ES ) else if( p_stream->p_oggds_header )
{ {
if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) ) /* number of sample from begining */
{ op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) *
/* FIXME, we assume only keyframes */ p_stream->p_oggds_header->i_samples_per_unit / I64C(1000000);
op.granulepos = ( ( i_dts - p_sys->i_start_dts ) *
p_input->p_fmt->video.i_frame_rate /
p_input->p_fmt->video.i_frame_rate_base /
I64C(1000000) ) << p_stream->i_keyframe_granule_shift;
}
else if( p_stream->p_oggds_header )
op.granulepos = ( i_dts - p_sys->i_start_dts ) * I64C(10) /
p_stream->p_oggds_header->i_time_unit;
} }
else if( p_stream->i_cat == SPU_ES ) }
else if( p_stream->i_cat == VIDEO_ES )
{
if( p_stream->i_fourcc == VLC_FOURCC( 't', 'h', 'e', 'o' ) )
{ {
/* granulepos is in milisec */ /* FIXME, we assume only keyframes */
op.granulepos = ( i_dts - p_sys->i_start_dts ) / 1000; op.granulepos = ( ( p_data->i_dts - p_sys->i_start_dts ) *
p_input->p_fmt->video.i_frame_rate /
p_input->p_fmt->video.i_frame_rate_base /
I64C(1000000) ) << p_stream->i_keyframe_granule_shift;
} }
else if( p_stream->p_oggds_header )
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) * I64C(10) /
p_stream->p_oggds_header->i_time_unit;
}
else if( p_stream->i_cat == SPU_ES )
{
/* granulepos is in milisec */
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000;
}
ogg_stream_packetin( &p_stream->os, &op ); ogg_stream_packetin( &p_stream->os, &op );
if( p_stream->i_cat == SPU_ES || if( p_stream->i_cat == SPU_ES ||
p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) ) p_stream->i_fourcc == VLC_FOURCC( 's', 'p', 'x', ' ' ) )
{ {
/* Subtitles or Speex packets are quite small so they /* Subtitles or Speex packets are quite small so they
* need to be flushed to be sent on time */ * need to be flushed to be sent on time */
p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts ); p_og = OggStreamFlush( p_mux, &p_stream->os, p_data->i_dts );
} }
else else
{ {
p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts ); p_og = OggStreamPageOut( p_mux, &p_stream->os, p_data->i_dts );
} }
if( p_og ) if( p_og )
{ {
OggSetDate( p_og, p_stream->i_dts, p_stream->i_length ); OggSetDate( p_og, p_stream->i_dts, p_stream->i_length );
p_stream->i_dts = -1; p_stream->i_dts = -1;
p_stream->i_length = 0; p_stream->i_length = 0;
sout_AccessOutWrite( p_mux->p_access, p_og ); sout_AccessOutWrite( p_mux->p_access, p_og );
} }
else else
{
if( p_stream->i_dts < 0 )
{ {
if( p_stream->i_dts < 0 ) p_stream->i_dts = p_data->i_dts;
{
p_stream->i_dts = p_data->i_dts;
}
p_stream->i_length += p_data->i_length;
} }
p_stream->i_length += p_data->i_length;
block_Release( p_data );
} }
block_Release( p_data );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment