X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fvoc.c;h=aa9ca8cb831ac0db4d55119824cc716fe45451b4;hb=292a24de34ead1c5222ccf5618bd76fc8ff73c3f;hp=abf9f61d0984246bfb7db099a9fa06d73227e1de;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/modules/demux/voc.c b/modules/demux/voc.c index abf9f61d09..aa9ca8cb83 100644 --- a/modules/demux/voc.c +++ b/modules/demux/voc.c @@ -1,10 +1,10 @@ /***************************************************************************** * voc.c : Creative Voice File (.VOC) demux module for vlc ***************************************************************************** - * Copyright (C) 2005 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 2005 Rémi Denis-Courmont * $Id$ * - * Authors: Remi Denis-Courmont + * Authors: Rémi Denis-Courmont * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,19 +18,21 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -38,13 +40,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( _("VOC demuxer") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_DEMUX ); - set_capability( "demux2", 10 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("VOC demuxer") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_DEMUX ) + set_capability( "demux", 10 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -76,7 +78,7 @@ static int Open( vlc_object_t * p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - uint8_t *p_buf; + const uint8_t *p_buf; uint16_t i_data_offset, i_version; if( stream_Peek( p_demux->s, &p_buf, 26 ) < 26 ) @@ -156,7 +158,6 @@ static unsigned int fix_voc_sr( unsigned int sr ) } return sr; } - static int ReadBlockHeader( demux_t *p_demux ) { @@ -189,11 +190,11 @@ static int ReadBlockHeader( demux_t *p_demux ) if( buf[1] ) { - msg_Err( p_demux, "Unsupported compression" ); + msg_Err( p_demux, "unsupported compression" ); return VLC_EGENERIC; } - new_fmt.i_codec = VLC_FOURCC('u','8',' ',' '); + new_fmt.i_codec = VLC_CODEC_U8; new_fmt.audio.i_rate = fix_voc_sr( 1000000L / (256L - buf[0]) ); new_fmt.audio.i_bytes_per_frame = 1; new_fmt.audio.i_frame_length = 1; @@ -218,7 +219,7 @@ static int ReadBlockHeader( demux_t *p_demux ) i_block_size = 0; p_sys->i_silence_countdown = GetWLE( buf ); - new_fmt.i_codec = VLC_FOURCC('u','8',' ',' '); + new_fmt.i_codec = VLC_CODEC_U8; new_fmt.audio.i_rate = fix_voc_sr( 1000000L / (256L - buf[0]) ); new_fmt.audio.i_bytes_per_frame = 1; new_fmt.audio.i_frame_length = 1; @@ -251,12 +252,57 @@ static int ReadBlockHeader( demux_t *p_demux ) } break; - /* FIXME: support block type 8 properly */ case 8: - msg_Err( p_demux, "Unimplemented block type 8" ); - return VLC_EGENERIC; + /* + * Block 8 is a big kludge to add stereo support to block 1 : + * A block of type 8 is always followed by a block of type 1 + * and specifies the number of channels in that 1-block + * (normally block 1 are always mono). In practice, block type 9 + * is used for stereo rather than 8 + */ + if( ( i_block_size != 4 ) + || ( stream_Read( p_demux->s, buf, 4 ) < 4 ) ) + goto corrupt; + + if( buf[2] ) + { + msg_Err( p_demux, "unsupported compression" ); + return VLC_EGENERIC; + } + + new_fmt.i_codec = VLC_CODEC_U8; + new_fmt.audio.i_channels = buf[3] + 1; /* can't be nul */ + new_fmt.audio.i_rate = 256000000L / + ((65536L - GetWLE(buf)) * new_fmt.audio.i_channels); + new_fmt.audio.i_bytes_per_frame = new_fmt.audio.i_channels; + new_fmt.audio.i_frame_length = 1; + new_fmt.audio.i_blockalign = new_fmt.audio.i_bytes_per_frame; + new_fmt.audio.i_bitspersample = 8 * new_fmt.audio.i_bytes_per_frame; + new_fmt.i_bitrate = new_fmt.audio.i_rate * 8; + + /* read subsequent block 1 */ + if( stream_Read( p_demux->s, buf, 4 ) < 4 ) + return VLC_EGENERIC; /* EOF */ + + i_block_size = GetDWLE( buf ) >> 8; + msg_Dbg( p_demux, "new block: type: %u, size: %u", + (unsigned)*buf, i_block_size ); + if( i_block_size < 2 ) + goto corrupt; + i_block_size -= 2; + + if( stream_Read( p_demux->s, buf, 2 ) < 2 ) + goto corrupt; + + if( buf[1] ) + { + msg_Err( p_demux, "unsupported compression" ); + return VLC_EGENERIC; + } - case 9: + break; + + case 9: /* newer data block with channel number and bits resolution */ if( i_block_size < 12 ) goto corrupt; i_block_size -= 12; @@ -275,15 +321,15 @@ static int ReadBlockHeader( demux_t *p_demux ) switch( new_fmt.audio.i_bitspersample ) { case 8: - new_fmt.i_codec = VLC_FOURCC('u','8',' ',' '); + new_fmt.i_codec = VLC_CODEC_U8; break; case 16: - new_fmt.i_codec = VLC_FOURCC('u','1','6','l'); + new_fmt.i_codec = VLC_CODEC_U16L; break; default: - msg_Err( p_demux, "Unsupported bit res.: %u bits", + msg_Err( p_demux, "unsupported bit res.: %u bits", new_fmt.audio.i_bitspersample ); return VLC_EGENERIC; } @@ -293,22 +339,22 @@ static int ReadBlockHeader( demux_t *p_demux ) switch( new_fmt.audio.i_bitspersample ) { case 8: - new_fmt.i_codec = VLC_FOURCC('s','8',' ',' '); + new_fmt.i_codec = VLC_CODEC_S8; break; case 16: - new_fmt.i_codec = VLC_FOURCC('s','1','6','l'); + new_fmt.i_codec = VLC_CODEC_S16L; break; default: - msg_Err( p_demux, "Unsupported bit res.: %u bits", + msg_Err( p_demux, "unsupported bit res.: %u bits", new_fmt.audio.i_bitspersample ); return VLC_EGENERIC; } break; - default: - msg_Err( p_demux, "Unsupported compression" ); + default: + msg_Err( p_demux, "unsupported compression" ); return VLC_EGENERIC; } @@ -321,7 +367,7 @@ static int ReadBlockHeader( demux_t *p_demux ) break; default: - msg_Dbg( p_demux, "Unknown block type %u - skipping block", + msg_Dbg( p_demux, "unknown block type %u - skipping block", (unsigned)*buf); case 4: /* blocks of non-audio types can be skipped */ case 5: @@ -414,13 +460,14 @@ static int Demux( demux_t *p_demux ) p_sys->i_silence_countdown -= i; } - p_block->i_dts = p_block->i_pts = - date_Increment( &p_sys->pts, p_sys->fmt.audio.i_frame_length * i ); + p_block->i_dts = p_block->i_pts = VLC_TS_0 + date_Get( &p_sys->pts ); es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block->i_pts ); es_out_Send( p_demux->out, p_sys->p_es, p_block ); + date_Increment( &p_sys->pts, p_sys->fmt.audio.i_frame_length * i ); + return 1; } @@ -441,7 +488,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; - return demux2_vaControlHelper( p_demux->s, p_sys->i_block_start, + return demux_vaControlHelper( p_demux->s, p_sys->i_block_start, p_sys->i_block_end, p_sys->fmt.i_bitrate, p_sys->fmt.audio.i_blockalign,