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

avformat/rsd: GADP files are adpcm_thp_le 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2015-11-19 16:00:16 -03:00
parent 3d2363fbf9
commit 01c63e69f1
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/rsd.c
View File

@ -27,7 +27,7 @@
static const AVCodecTag rsd_tags[] = { static const AVCodecTag rsd_tags[] = {
{ AV_CODEC_ID_ADPCM_PSX, MKTAG('V','A','G',' ') }, { AV_CODEC_ID_ADPCM_PSX, MKTAG('V','A','G',' ') },
{ AV_CODEC_ID_ADPCM_THP, MKTAG('G','A','D','P') }, { AV_CODEC_ID_ADPCM_THP_LE, MKTAG('G','A','D','P') },
{ AV_CODEC_ID_ADPCM_THP, MKTAG('W','A','D','P') }, { AV_CODEC_ID_ADPCM_THP, MKTAG('W','A','D','P') },
{ AV_CODEC_ID_ADPCM_IMA_RAD, MKTAG('R','A','D','P') }, { AV_CODEC_ID_ADPCM_IMA_RAD, MKTAG('R','A','D','P') },
{ AV_CODEC_ID_ADPCM_IMA_WAV, MKTAG('X','A','D','P') }, { AV_CODEC_ID_ADPCM_IMA_WAV, MKTAG('X','A','D','P') },
@ -121,8 +121,7 @@ static int rsd_read_header(AVFormatContext *s)
if (pb->seekable) if (pb->seekable)
st->duration = av_get_audio_frame_duration(codec, avio_size(pb) - start); st->duration = av_get_audio_frame_duration(codec, avio_size(pb) - start);
break; break;
case AV_CODEC_ID_ADPCM_THP: case AV_CODEC_ID_ADPCM_THP_LE:
if (st->codec->codec_tag == MKTAG('G','A','D','P')) {
/* RSD3GADP is mono, so only alloc enough memory /* RSD3GADP is mono, so only alloc enough memory
to store the coeff table for a single channel. */ to store the coeff table for a single channel. */
@ -130,11 +129,10 @@ static int rsd_read_header(AVFormatContext *s)
if ((ret = ff_get_extradata(codec, s->pb, 32)) < 0) if ((ret = ff_get_extradata(codec, s->pb, 32)) < 0)
return ret; return ret;
if (pb->seekable)
for (i = 0; i < 16; i++) st->duration = av_get_audio_frame_duration(codec, avio_size(pb) - start);
AV_WB16(codec->extradata + i * 2, AV_RL16(codec->extradata + i * 2)); break;
case AV_CODEC_ID_ADPCM_THP:
} else {
codec->block_align = 8 * codec->channels; codec->block_align = 8 * codec->channels;
avio_skip(s->pb, 0x1A4 - avio_tell(s->pb)); avio_skip(s->pb, 0x1A4 - avio_tell(s->pb));
@ -145,7 +143,6 @@ static int rsd_read_header(AVFormatContext *s)
avio_read(s->pb, st->codec->extradata + 32 * i, 32); avio_read(s->pb, st->codec->extradata + 32 * i, 32);
avio_skip(s->pb, 8); avio_skip(s->pb, 8);
} }
}
if (pb->seekable) if (pb->seekable)
st->duration = (avio_size(pb) - start) / (8 * st->codec->channels) * 14; st->duration = (avio_size(pb) - start) / (8 * st->codec->channels) * 14;
break; break;