virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/argo_brp: allow v1.1 ASF streams to have a non-22050 sample rate in certain circumstances

Browse Source 
It seems that in files where the BASF block isn't first, v1.1 ASF streams are
allowed to be non-22050. Either this format is really inconsistent, or
FX Fighter and Croc just ignored the sample rate field, requiring the v1.1
restriction in the first place.

This bumps the version to 1.2 in these streams so they're not "corrected".

Found in Alien Odyssey games files in:
./GRAPHICS/COMMBUNK/{{COMADD1,COMM2_{1,2,3E},COMM3_{2,3,4,5,6}},FADE{1,2}}.BRP

Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Zane van Iperen
2020-09-25 22:25:42 +10:00
parent 97efac3ac1
commit 3ffb15a105
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/argo_brp.c
View File

@@ -323,6 +323,20 @@ static int argo_brp_read_header(AVFormatContext *s)
ff_argo_asf_parse_chunk_header(&brp->basf.ckhdr, buf);
/*
* Special Case Hack. It seems that in files where the BASF block isn't first,
* v1.1 streams are allowed to be non-22050...
* Bump the version to 1.2 so ff_argo_asf_fill_stream() doesn't "correct" it.
*
* Found in Alien Odyssey games files in:
* ./GRAPHICS/COMMBUNK/{{COMADD1,COMM2_{1,2,3E},COMM3_{2,3,4,5,6}},FADE{1,2}}.BRP
*
* Either this format really inconsistent, or FX Fighter and Croc just ignored the
* sample rate field...
*/
if (i != 0 && hdr->extradata.basf.version_major == 1 && hdr->extradata.basf.version_minor == 1)
hdr->extradata.basf.version_minor = 2;
if ((ret = ff_argo_asf_fill_stream(s, st, &hdr->extradata.basf, &brp->basf.ckhdr)) < 0)
return ret;