From 46fc365fe003c7f92f8d525890eaa98b355d8a81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 23 Jun 2013 20:15:09 +0200 Subject: [PATCH] flac decoder: supports avformat extradata --- modules/codec/flac.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/codec/flac.c b/modules/codec/flac.c index 25bc92c516..215de76d5f 100644 --- a/modules/codec/flac.c +++ b/modules/codec/flac.c @@ -379,9 +379,26 @@ static void ProcessHeader( decoder_t *p_dec ) /* Decode STREAMINFO */ msg_Dbg( p_dec, "decode STREAMINFO" ); - p_sys->p_block = block_Alloc( p_dec->fmt_in.i_extra ); - memcpy( p_sys->p_block->p_buffer, p_dec->fmt_in.p_extra, - p_dec->fmt_in.i_extra ); + size_t i_extra = p_dec->fmt_in.i_extra; + switch (i_extra) { + case 34: + p_sys->p_block = block_Alloc( 8 + i_extra ); + memcpy( p_sys->p_block->p_buffer + 8, p_dec->fmt_in.p_extra, i_extra ); + memcpy( p_sys->p_block->p_buffer, "fLaC", 4); + uint8_t *p = p_sys->p_block->p_buffer; + p[4] = 0; /* STREAMINFO */ + p[5] = 0; + p[6] = 0; + p[7] = 34; /* block size */ + break; + case 42: + p_sys->p_block = block_Alloc( i_extra ); + memcpy( p_sys->p_block->p_buffer, p_dec->fmt_in.p_extra, i_extra ); + break; + default: + msg_Err(p_dec, "Invalid flac header size %zu\n", i_extra); + return; + } FLAC__stream_decoder_process_until_end_of_metadata( p_sys->p_flac ); msg_Dbg( p_dec, "STREAMINFO decoded" ); } -- 2.39.5