kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MAD Decoder] Patch a slight bug in libmad 

There was a slight bug with handling Xing/LAME headers with main data
pointers indicating data preceding the header frame. This should allow
decoding their information properly.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
swiftingly
Christopher Snowhill 2022-06-19 18:26:18 -07:00
parent 163ae5c864
commit 453e29b2f5
4 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/MAD/MADDecoder.m
View File

@ -178,6 +178,8 @@
}
free(tagBuffer);
} else if(stream.error == MAD_ERROR_BADDATAPTR) {
goto framedecoded;
}
continue;
@ -190,6 +192,7 @@
break;
}
}
framedecoded:
framesDecoded++;
if(framesDecoded == 1) {

6
ThirdParty/libmad/README.md vendored
View File

@ -1,6 +1,8 @@
Built with the Homebrew defaults, sort of:
Built with the Homebrew defaults, sort of. Plus a patch to fix weird LAME/Xing
headers:
```
patch -Np1 -i libmad_ancdata.patch
touch NEWS
touch AUTHORS
touch ChangeLog
@ -9,4 +11,4 @@ autoreconf -fiv
make -j8 CFLAGS="-Os -arch x86_64 -arch arm64 -mmacosx-version-min=10.12" LDFLAGS="-arch x86_64 -arch arm64 -mmacosx-version-min=10.12"
```
Version 0.15.1b was used.
Version 0.15.1b was used, with the minor patch listed above.

BIN
ThirdParty/libmad/lib/libmad.a vendored
View File

Binary file not shown.

29
ThirdParty/libmad/patches/libmad_ancdata.patch vendored Normal file
View File

@ -0,0 +1,29 @@
diff -urN libmad-0.15.1b.orig/frame.c libmad-0.15.1b.patched/frame.c
--- libmad-0.15.1b.orig/frame.c 2022-06-19 17:20:02.000000000 -0700
+++ libmad-0.15.1b.patched/frame.c 2022-06-19 18:18:39.000000000 -0700
@@ -473,7 +473,9 @@
return 0;
fail:
- stream->anc_bitlen = 0;
+ if(stream->error != MAD_ERROR_BADDATAPTR) {
+ stream->anc_bitlen = 0;
+ }
return -1;
}
diff -urN libmad-0.15.1b.orig/layer3.c libmad-0.15.1b.patched/layer3.c
--- libmad-0.15.1b.orig/layer3.c 2022-06-19 17:20:02.000000000 -0700
+++ libmad-0.15.1b.patched/layer3.c 2022-06-19 18:18:47.000000000 -0700
@@ -2656,6 +2656,11 @@
stream->anc_ptr = ptr;
stream->anc_bitlen = md_len * CHAR_BIT - data_bitlen;
}
+ else {
+ /* Give it the rest of the frame */
+ stream->anc_ptr = stream->ptr;
+ stream->anc_bitlen = frame_free * CHAR_BIT;
+ }
# if 0 && defined(DEBUG)
fprintf(stderr,