Skip to content

V
vlc-1.1
Commit 2067ae4c authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/codec/mpeg_audio.c: fixes for free format support.

parent 706d6346
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
modules/codec/mpeg_audio.c
View file @ 2067ae4c
...@@ -298,12 +298,13 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) ...@@ -298,12 +298,13 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( p_sys->i_bit_rate == 0 ) if( p_sys->i_bit_rate == 0 )
{ {
/* Free birate, but 99% emulated startcode :( */ /* Free bitrate, but 99% emulated startcode :( */
if( p_dec->p_sys->i_free_frame_size == MPGA_HEADER_SIZE ) if( p_dec->p_sys->i_free_frame_size == MPGA_HEADER_SIZE )
{ {
msg_Dbg( p_dec, "free bitrate mode"); msg_Dbg( p_dec, "free bitrate mode");
} }
p_sys->i_frame_size = p_sys->i_free_frame_size; /* The -1 below is to account for the frame padding */
p_sys->i_frame_size = p_sys->i_free_frame_size - 1;
} }
p_sys->i_state = STATE_NEXT_SYNC; p_sys->i_state = STATE_NEXT_SYNC;
...@@ -705,6 +706,9 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, ...@@ -705,6 +706,9 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
default: default:
break; break;
} }
/* Free bitrate mode can support higher bitrates */
if( !*pi_bit_rate ) *pi_max_frame_size *= 2;
} }
else else
{ {
......
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