Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove standard G.722.1 (Siren7), since no game uses it

Browse Source 
Siren14 wasn't affected by this
This commit is contained in:
bnnm 2018-09-22 16:32:21 +02:00
parent 1e9dbb851b
commit 0e4ee632b9
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -229,7 +229,6 @@ are used in few games.
- CRI HCA
- Xiph Vorbis (Ogg, FSB5, Wwise, OGL, Silicon Knights)
- MPEG MP1/2/3 (standard, AHX, XVAG, FSB, AWC, P3D, etc)
- ITU-T G.722.1 (Polycom Siren 7)
- ITU-T G.722.1 annex C (Polycom Siren 14)
- ITU G.719 annex B (Polycom Siren 22)
- Electronic Arts EALayer3

8
doc/BUILD.md
View File

@ -172,7 +172,7 @@ Must use autotools (sh configure, make, make install), though some scripts simpl
### libg7221_decode
Adds support for ITU-T G.722.1 and G.722.1 annex C (standardization of Polycom Siren 7/14).
Adds support for ITU-T G.722.1 annex C (standardization of Polycom Siren 14).
- Source: https://github.com/kode54/libg7221_decode
- DLL: `libg7221_decode.dll`
@ -203,14 +203,14 @@ Adds support for ATRAC9.
- Source: https://github.com/Thealexbarney/LibAtrac9
- DLL: `libatrac9.dll`
Use MSCV and `libatrac9.sln`.
Use MSCV and `libatrac9.sln`, or GCC and the Makefile included.
### libcelt
Adds support for FSB CELT versions 0.6.1 and 0.11.0.
- DLL: `libcelt-0061.dll`, `libcelt-0110.dll`
- Source (0.6.1): http://downloads.us.xiph.org/releases/celt/celt-0.6.1.tar.gz
- Source (0.11.0): http://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz
- DLL: `libcelt-0061.dll`, `libcelt-0110.dll`
FSB uses two incompatible, older libcelt versions. Both libraries export the same symbols so normally can't coexist together. To get them working we need to make sure symbols are renamed first. This may be solved in various ways:
- using dynamic loading (LoadLibrary) but for portability it isn't an option
@ -219,7 +219,7 @@ FSB uses two incompatible, older libcelt versions. Both libraries export the sam
- Use GCC's preprocessor to rename functions on compile
- Rename functions in the source code directly.
To compile we use autotools with GCC preprocessor renaming:
To compile we'll use autotools with GCC preprocessor renaming:
- in the celt-0.6.1 dir:
```
# creates Makefiles with Automake

1
src/formats.c
View File

@ -603,7 +603,6 @@ static const coding_info coding_info_list[] = {
{coding_MPEG_layer3, "MPEG Layer III Audio (MP3)"},
#endif
#ifdef VGM_USE_G7221
{coding_G7221, "ITU G.722.1 (Polycom Siren 7)"},
{coding_G7221C, "ITU G.722.1 annex C (Polycom Siren 14)"},
#endif
#ifdef VGM_USE_G719

12
src/vgmstream.c
View File

@ -597,8 +597,7 @@ void reset_vgmstream(VGMSTREAM * vgmstream) {
#endif
#ifdef VGM_USE_G7221
if (vgmstream->coding_type==coding_G7221 ||
vgmstream->coding_type==coding_G7221C) {
if (vgmstream->coding_type==coding_G7221C) {
reset_g7221(vgmstream);
}
#endif
@ -781,8 +780,7 @@ void close_vgmstream(VGMSTREAM * vgmstream) {
#endif
#ifdef VGM_USE_G7221
if (vgmstream->coding_type == coding_G7221 ||
vgmstream->coding_type == coding_G7221C) {
if (vgmstream->coding_type == coding_G7221C) {
free_g7221(vgmstream);
vgmstream->codec_data = NULL;
}
@ -1193,9 +1191,7 @@ int get_vgmstream_samples_per_frame(VGMSTREAM * vgmstream) {
#ifdef VGM_USE_G7221
case coding_G7221C:
return 32000/50;
case coding_G7221:
return 16000/50;
return 32000/50; /* Siren7: 16000/50 */
#endif
#ifdef VGM_USE_G719
case coding_G719:
@ -1371,7 +1367,6 @@ int get_vgmstream_frame_size(VGMSTREAM * vgmstream) {
#ifdef VGM_USE_G7221
case coding_G7221C:
case coding_G7221:
#endif
#ifdef VGM_USE_G719
case coding_G719:
@ -1846,7 +1841,6 @@ void decode_vgmstream(VGMSTREAM * vgmstream, int samples_written, int samples_to
break;
#endif
#ifdef VGM_USE_G7221
case coding_G7221:
case coding_G7221C:
for (ch = 0; ch < vgmstream->channels; ch++) {
decode_g7221(vgmstream, buffer+samples_written*vgmstream->channels+ch,

1
src/vgmstream.h
View File

@ -177,7 +177,6 @@ typedef enum {
#endif
#ifdef VGM_USE_G7221
coding_G7221, /* ITU G.722.1 (Polycom Siren 7) */
coding_G7221C, /* ITU G.722.1 annex C (Polycom Siren 14) */
#endif