RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify the voc demuxer using av_get_bits_per_sample() 

Originally committed as revision 5663 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2006-07-07 22:42:36 +00:00
parent c448303df6
commit 5da714699d
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utils.c
View File

@ -1306,6 +1306,11 @@ char av_get_pict_type_char(int pict_type){
int av_get_bits_per_sample(enum CodecID codec_id){ int av_get_bits_per_sample(enum CodecID codec_id){
switch(codec_id){ switch(codec_id){
case CODEC_ID_ADPCM_CT:
case CODEC_ID_ADPCM_SBPRO_2:
case CODEC_ID_ADPCM_SBPRO_3:
case CODEC_ID_ADPCM_SBPRO_4:
return 0;
case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_ALAW:
case CODEC_ID_PCM_MULAW: case CODEC_ID_PCM_MULAW:
case CODEC_ID_PCM_S8: case CODEC_ID_PCM_S8:

14
libavformat/voc.c
View File

@ -93,18 +93,6 @@ static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
return 0; return 0;
} }
static int voc_get_bps(int codec_id)
{
switch (codec_id) {
case CODEC_ID_PCM_S16LE:
return 16;
case CODEC_ID_ADPCM_CT:
return 4;
default:
return 8;
}
}
int int
voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
{ {
@ -130,7 +118,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
dec->sample_rate = sample_rate; dec->sample_rate = sample_rate;
dec->channels = channels; dec->channels = channels;
dec->codec_id = codec_get_id(voc_codec_tags, get_byte(pb)); dec->codec_id = codec_get_id(voc_codec_tags, get_byte(pb));
dec->bits_per_sample = voc_get_bps(dec->codec_id); dec->bits_per_sample = av_get_bits_per_sample(dec->codec_id);
voc->remaining_size -= 2; voc->remaining_size -= 2;
max_size -= 2; max_size -= 2;
channels = 1; channels = 1;