From e9eb5d5e4e2c9e1d576f4f5af8b6eaaa7451431a Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 23 Sep 2009 18:57:27 +0300 Subject: [PATCH] aout_buffer_t.b_disconuity -> aout_buffert.i_flags --- include/vlc_aout.h | 2 +- modules/audio_filter/converter/mpgatofixed32.c | 4 ++-- modules/codec/mpeg_audio.c | 3 ++- modules/stream_out/transcode.c | 2 +- src/audio_output/common.c | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 05c0f5da4a..2173fa521c 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -133,7 +133,7 @@ struct aout_buffer_t * is the number of significative bytes in it. */ size_t i_size, i_nb_bytes; unsigned int i_nb_samples; - bool b_discontinuity; /* Set on discontinuity (for non pcm stream) */ + uint32_t i_flags; mtime_t i_pts, end_date; struct aout_buffer_t * p_next; diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index fe5fb30122..caa8f1f37b 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -141,7 +141,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, mad_stream_errorstr( &p_sys->mad_stream ) ); p_sys->i_reject_count = 3; } - else if( p_in_buf->b_discontinuity ) + else if( p_in_buf->i_flags & BLOCK_FLAG_DISCONUITY ) { p_sys->i_reject_count = 3; } @@ -395,7 +395,7 @@ static block_t *Convert( filter_t *p_filter, block_t *p_block ) aout_filter.output.i_format = p_filter->fmt_out.i_codec; in_buf.p_buffer = p_block->p_buffer; - in_buf.b_discontinuity = false; + in_buf.i_flags = 0; in_buf.i_nb_bytes = p_block->i_buffer; in_buf.i_nb_samples = p_block->i_nb_samples; out_buf.p_buffer = p_out->p_buffer; diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c index 713e3d8cbc..c66633ebe7 100644 --- a/modules/codec/mpeg_audio.c +++ b/modules/codec/mpeg_audio.c @@ -541,7 +541,8 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) p_buf->i_pts = date_Get( &p_sys->end_date ); p_buf->end_date = date_Increment( &p_sys->end_date, p_sys->i_frame_length ); - p_buf->b_discontinuity = p_sys->b_discontinuity; + if( p_sys->b_discontinuity ) + p_buf->i_flags |= BLOCK_FLAG_DISCONTINUITY; p_sys->b_discontinuity = false; /* Hack for libmad filter */ diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c index 59767066ac..83fafdb422 100644 --- a/modules/stream_out/transcode.c +++ b/modules/stream_out/transcode.c @@ -1368,7 +1368,7 @@ static aout_buffer_t *audio_new_buffer( decoder_t *p_dec, int i_samples ) p_buffer = malloc( sizeof(aout_buffer_t) ); if( !p_buffer ) return NULL; - p_buffer->b_discontinuity = false; + p_buffer->i_flags = 0; p_buffer->p_sys = p_block = block_New( p_dec, i_size ); p_buffer->p_buffer = p_block->p_buffer; diff --git a/src/audio_output/common.c b/src/audio_output/common.c index de1d1f3ff1..f71309ab61 100644 --- a/src/audio_output/common.c +++ b/src/audio_output/common.c @@ -719,6 +719,6 @@ aout_buffer_t *aout_BufferAlloc(aout_alloc_t *allocation, mtime_t microseconds, buffer->i_size = i_alloc_size; buffer->p_buffer = (uint8_t *)buffer + sizeof(aout_buffer_t); - buffer->b_discontinuity = false; + buffer->i_flags = 0; return buffer; } -- 2.39.2