/*****************************************************************************
* wav.c : wav file input module for vlc
*****************************************************************************
/*****************************************************************************
* wav.c : wav file input module for vlc
*****************************************************************************
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* 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
*****************************************************************************/
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * );
static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * );
static void FrameInfo_IMA_ADPCM( demux_t *, unsigned int *, int * );
static void FrameInfo_MS_ADPCM ( demux_t *, unsigned int *, int * );
- if( strncmp( p_peek, "RIFF", 4 ) || strncmp( &p_peek[8], "WAVE", 4 ) )
+ if( memcmp( p_peek, "RIFF", 4 ) || memcmp( &p_peek[8], "WAVE", 4 ) )
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
p_wf = (WAVEFORMATEX *)p_wf_ext;
p_wf->cbSize = 0;
if( stream_Read( p_demux->s,
p_wf = (WAVEFORMATEX *)p_wf_ext;
p_wf->cbSize = 0;
if( stream_Read( p_demux->s,
}
if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') ||
}
if( p_sys->fmt.i_codec == VLC_FOURCC('a','r','a','w') ||
p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') )
p_sys->b_chan_reorder =
p_sys->fmt.i_codec == VLC_FOURCC('a','f','l','t') )
p_sys->b_chan_reorder =
}
msg_Dbg( p_demux, "format: 0x%4.4x, fourcc: %4.4s, channels: %d, "
}
msg_Dbg( p_demux, "format: 0x%4.4x, fourcc: %4.4s, channels: %d, "
- "freq: %d Hz, bitrate: %dKo/s, blockalign: %d, bits/samples: %d, "
+ "freq: %u Hz, bitrate: %uKo/s, blockalign: %d, bits/samples: %d, "
"extra size: %d",
GetWLE( &p_wf->wFormatTag ), (char *)&p_sys->fmt.i_codec,
p_sys->fmt.audio.i_channels, p_sys->fmt.audio.i_rate,
"extra size: %d",
GetWLE( &p_wf->wFormatTag ), (char *)&p_sys->fmt.i_codec,
p_sys->fmt.audio.i_channels, p_sys->fmt.audio.i_rate,
case VLC_FOURCC( 'a', 'f', 'l', 't' ):
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
case VLC_FOURCC( 'a', 'f', 'l', 't' ):
case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
case VLC_FOURCC( 'a', 'l', 'a', 'w' ):
+ case VLC_FOURCC( 'm', 'l', 'a', 'w' ):
+ case VLC_FOURCC( 'p', 'c', 'm', ' ' ):
FrameInfo_PCM( p_demux, &p_sys->i_frame_size,
&p_sys->i_frame_samples );
break;
FrameInfo_PCM( p_demux, &p_sys->i_frame_size,
&p_sys->i_frame_samples );
break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'a', '5', '2', ' ' ):
/* FIXME set end of area FIXME */
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'a', '5', '2', ' ' ):
/* FIXME set end of area FIXME */
default:
msg_Err( p_demux, "unsupported codec (%4.4s)",
(char*)&p_sys->fmt.i_codec );
default:
msg_Err( p_demux, "unsupported codec (%4.4s)",
(char*)&p_sys->fmt.i_codec );
- return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end,
/*****************************************************************************
* Local functions
*****************************************************************************/
/*****************************************************************************
* Local functions
*****************************************************************************/
- msg_Dbg( p_demux, "Chunk: fcc=`%4.4s` size=%d", p_peek, i_size );
+ msg_Dbg( p_demux, "chunk: fcc=`%4.4s` size=%d", p_peek, i_size );