From a5a87c3c662a3f733d1b7a49b8cf5c5f595aed41 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Fri, 15 Nov 2013 15:25:48 +0100 Subject: [PATCH] Revert "flac packetizer: use the largest possible frame size" This reverts commit 03e0644c82bf1dea96f8ade8829c2e1f360bd1ee. Decoder needs single frames Closes #9863 --- modules/packetizer/flac.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c index 16d3c46b1f..090b60160e 100644 --- a/modules/packetizer/flac.c +++ b/modules/packetizer/flac.c @@ -248,7 +248,6 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) while( 1 ) { - int previous_size; switch( p_sys->i_state ) { case STATE_NOSYNC: @@ -316,8 +315,6 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) /* TODO: If pp_block == NULL, flush the buffer without checking the * next sync word */ - previous_size = 0; /* Try to return the biggest frame */ - /* Check if next expected frame contains the sync word */ while( block_PeekOffsetBytes( &p_sys->bytestream, p_sys->i_frame_size, p_header, @@ -333,27 +330,13 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block ) &p_sys->i_rate, &p_sys->i_bits_per_sample ); - if( i_frame_length ) { - if( !p_sys->b_stream_info || p_sys->stream_info.max_framesize <= 0 ) { - /* Stop immediately if we don't know the maximum framesize */ - p_sys->i_state = STATE_SEND_DATA; - break; - } - previous_size = p_sys->i_frame_size; + if( i_frame_length ) + { + p_sys->i_state = STATE_SEND_DATA; + break; } } p_sys->i_frame_size++; - - if( p_sys->b_stream_info && p_sys->stream_info.max_framesize > 0 && - p_sys->i_frame_size > p_sys->stream_info.max_framesize ) - break; - } - - if (previous_size) - { - /* Use the largest frame size */ - p_sys->i_frame_size = previous_size; - p_sys->i_state = STATE_SEND_DATA; } if( p_sys->i_state != STATE_SEND_DATA ) -- 2.11.4.GIT