RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-04 23:31:01 +00:00
Code Issues Projects Releases Wiki Activity

avformat: Use G726LE decoder for Sun AU files

Browse Source 
fixes ticket #1955 as suggested by Roman.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Carl Eugen Hoyos 2013-07-11 14:06:20 +02:00 committed by Michael Niedermayer
parent 10c240a085
commit 640c70ddc2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/au.c
View File

@ -45,8 +45,12 @@ static const AVCodecTag codec_au_tags[] = {
{ AV_CODEC_ID_PCM_S32BE, 5 }, { AV_CODEC_ID_PCM_S32BE, 5 },
{ AV_CODEC_ID_PCM_F32BE, 6 }, { AV_CODEC_ID_PCM_F32BE, 6 },
{ AV_CODEC_ID_PCM_F64BE, 7 }, { AV_CODEC_ID_PCM_F64BE, 7 },
{ AV_CODEC_ID_ADPCM_G726LE, 23 },
{ AV_CODEC_ID_ADPCM_G722,24 }, { AV_CODEC_ID_ADPCM_G722,24 },
{ AV_CODEC_ID_ADPCM_G726LE, 25 },
{ AV_CODEC_ID_ADPCM_G726LE, 26 },
{ AV_CODEC_ID_PCM_ALAW, 27 }, { AV_CODEC_ID_PCM_ALAW, 27 },
{ AV_CODEC_ID_ADPCM_G726LE, MKBETAG('7','2','6','2') },
{ AV_CODEC_ID_NONE, 0 }, { AV_CODEC_ID_NONE, 0 },
}; };
@ -101,7 +105,14 @@ static int au_read_header(AVFormatContext *s)
} }
bps = av_get_bits_per_sample(codec); bps = av_get_bits_per_sample(codec);
if (!bps) { if (codec == AV_CODEC_ID_ADPCM_G726LE) {
if (id == MKBETAG('7','2','6','2')) {
bps = 2;
} else {
const uint8_t bpcss[] = {4, 0, 3, 5};
bps = bpcss[id - 23];
}
} else if (!bps) {
avpriv_request_sample(s, "Unknown bits per sample"); avpriv_request_sample(s, "Unknown bits per sample");
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
@ -124,6 +135,7 @@ static int au_read_header(AVFormatContext *s)
st->codec->codec_id = codec; st->codec->codec_id = codec;
st->codec->channels = channels; st->codec->channels = channels;
st->codec->sample_rate = rate; st->codec->sample_rate = rate;
st->codec->bits_per_coded_sample = bps;
st->codec->bit_rate = channels * rate * bps; st->codec->bit_rate = channels * rate * bps;
st->codec->block_align = FFMAX(bps * st->codec->channels / 8, 1); st->codec->block_align = FFMAX(bps * st->codec->channels / 8, 1);
if (data_size != AU_UNKNOWN_SIZE) if (data_size != AU_UNKNOWN_SIZE)