virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

support dvd pcm 20/24 bits, patch by Lars Täuber, lars.taeuber gmx net

Browse Source 
Originally committed as revision 13206 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Lars Täuber 2008-05-21 02:26:42 +00:00 committed by Baptiste Coudurier
parent 3e67f255a4
commit 4860abb116
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mpeg.c
View File

@ -474,7 +474,8 @@ static int mpegps_read_packet(AVFormatContext *s,
codec_id = CODEC_ID_DTS; codec_id = CODEC_ID_DTS;
} else if (startcode >= 0xa0 && startcode <= 0xaf) { } else if (startcode >= 0xa0 && startcode <= 0xaf) {
type = CODEC_TYPE_AUDIO; type = CODEC_TYPE_AUDIO;
codec_id = CODEC_ID_PCM_S16BE; /* 16 bit form will be handled as CODEC_ID_PCM_S16BE */
codec_id = CODEC_ID_PCM_DVD;
} else if (startcode >= 0xb0 && startcode <= 0xbf) { } else if (startcode >= 0xb0 && startcode <= 0xbf) {
type = CODEC_TYPE_AUDIO; type = CODEC_TYPE_AUDIO;
codec_id = CODEC_ID_MLP; codec_id = CODEC_ID_MLP;
@ -519,7 +520,14 @@ static int mpegps_read_packet(AVFormatContext *s,
freq = (b1 >> 4) & 3; freq = (b1 >> 4) & 3;
st->codec->sample_rate = lpcm_freq_tab[freq]; st->codec->sample_rate = lpcm_freq_tab[freq];
st->codec->channels = 1 + (b1 & 7); st->codec->channels = 1 + (b1 & 7);
st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * 2; st->codec->bits_per_sample = 16 + ((b1 >> 6) & 3) * 4;
st->codec->bit_rate = st->codec->channels *
st->codec->sample_rate *
st->codec->bits_per_sample;
if (st->codec->bits_per_sample == 16)
st->codec->codec_id = CODEC_ID_PCM_S16BE;
else if (st->codec->bits_per_sample == 28)
return AVERROR(EINVAL);
} }
av_new_packet(pkt, len); av_new_packet(pkt, len);
get_buffer(s->pb, pkt->data, pkt->size); get_buffer(s->pb, pkt->data, pkt->size);