Merge pull request #1543 from bnnm/ktsr-cleanup

- Add .ktsl2asbin with KTAC [Blue Reflection 2 (PS4)]
- cleanup

doc/FORMATS.md

@@ -102,7 +102,8 @@ different internally (encrypted, different versions, etc) and not always can be
   - TOSE .IDSP header [*IDSP_TOSE*]
   - Kuju London .KWA header [*DSP_KWA*]
   - Koei Tecmo APEX header [*DSP_APEX*]
-  - *ngc_dsp_std*: `.dsp .adp .(extensionless)`
+  - Rebellion DSP header [*DSP_ASURA*]
+  - *ngc_dsp_std*: `.dsp .adp .(extensionless) .wav .lwav .dat .ldat`
   - *ngc_dsp_std_le*: `.adpcm`
   - *ngc_mdsp_std*: `.dsp .mdsp`
   - *ngc_dsp_stm*: `.stm .lstm .dsp`
@@ -113,7 +114,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - *idsp_tt*: `.gcm .idsp .wua`
   - *idsp_nl*: `.idsp`
   - *wii_wsd*: `.wsd`
-  - *dsp_ddsp*: `.adp .ddsp .wav .lwav`
+  - *dsp_ddsp*: `.adp .ddsp .wav .lwav .(extensionless)`
   - *wii_was*: `.was .dsp .isws`
   - *dsp_str_ig*: `.str`
   - *dsp_xiii*: `.dsp`
@@ -128,7 +129,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - *dsp_itl_ch*: `.itl`
   - *dsp_adpy*: `.adpcmx`
   - *dsp_adpx*: `.adpcmx`
-  - *dsp_ds2*: `.ds2 .dsp`
+  - *dsp_lucasarts_ds2*: `.ds2 .dsp`
   - *dsp_itl*: `.itl .dsp`
   - *dsp_sqex*: `.wav .lwav`
   - *dsp_wiivoice*: `.dsp`
@@ -137,6 +138,9 @@ different internally (encrypted, different versions, etc) and not always can be
   - *idsp_tose*: `.idsp`
   - *dsp_kwa*: `.kwa`
   - *dsp_apex*: `.dsp`
+  - *dsp_asura*: `.dsp .wav .lwav`
+  - *dsp_asura_ds2*: `.ds2`
+  - *dsp_asura_ttss*: `.adpcm .wav .lwav`
   - Codecs: NGC_DSP NGC_DSP_subint
 - **csmp.c**
   - Retro Studios CSMP header [*CSMP*]
@@ -186,7 +190,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - Sony VAG header [*VAG*]
   - Acclaim Austin AAAp header [*AAAP*]
   - Sony VAG footer [*VAG_footer*]
-  - *vag*: `.vag .swag .str .vig .l .r .vas .xa2 .snd .svg .(extensionless)`
+  - *vag*: `.vag .swag .str .vig .l .r .vas .xa2 .snd .svg .(extensionless) .wav .lwav`
   - *vag_aaap*: `.vag`
   - *vag_footer*: `.(extensionless) .vag`
   - Codecs: PSX HEVAG
@@ -1616,7 +1620,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - *ktsr*: `.ktsl2asbin .asbin`
   - *asrs*: `.srsa`
   - *ktsr_internal*
-    - Subfiles: *riff ogg_vorbis ktss*
+    - Subfiles: *riff ogg_vorbis ktss ktac*
   - Codecs: MSADPCM_int NGC_DSP ATRAC9
 - **mups.c**
   - (container)
@@ -1787,7 +1791,7 @@ different internally (encrypted, different versions, etc) and not always can be
   - *ego_dic*: `.dic + .(external)`
   - Codecs: PCM16LE ULAW XBOX_IMA OGG_VORBIS
 - **awd.c**
-  - RenderWare Audio Wave Dictionary header [*AWD*]
+  - RenderWare AWD header [*AWD*]
   - *awd*: `.awd .hwd .lwd`
   - Codecs: PSX PCM16LE NGC_DSP XBOX_IMA
 - **rws_809.c**
@@ -1825,6 +1829,10 @@ different internally (encrypted, different versions, etc) and not always can be
 - **ea_sbk.c**
   - Electronic Arts SBK header [*EA_SBK*]
   - *ea_sbk*: `.sbk`
+- **ngc_dsp_asura.c**
+  - Rebellion DSP header [*DSP_ASURA*]
+  - *dsp_asura_sfx*: `.sfx`
+  - Codecs: NGC_DSP
 - **agsc.c**
   - Retro Studios AGSC header [*AGSC*]
   - *agsc*: `.agsc`

src/base/decode.c

@@ -416,7 +416,7 @@ int decode_get_samples_per_frame(VGMSTREAM* vgmstream) {
             return 2;
         case coding_XBOX_IMA:
         case coding_XBOX_IMA_mch:
-        case coding_XBOX_IMA_int:
+        case coding_XBOX_IMA_mono:
         case coding_FSB_IMA:
         case coding_WWISE_IMA:
         case coding_CD_IMA: /* (0x24 - 0x04) * 2 */
@@ -467,7 +467,7 @@ int decode_get_samples_per_frame(VGMSTREAM* vgmstream) {
 
         case coding_MSADPCM:
             return (vgmstream->frame_size - 0x07*vgmstream->channels)*2 / vgmstream->channels + 2;
-        case coding_MSADPCM_int:
+        case coding_MSADPCM_mono:
         case coding_MSADPCM_ck:
             return (vgmstream->frame_size - 0x07)*2 + 2;
         case coding_WS: /* only works if output sample size is 8 bit, which always is for WS ADPCM */
@@ -653,7 +653,7 @@ int decode_get_frame_size(VGMSTREAM* vgmstream) {
         case coding_XBOX_IMA:
             //todo should be  0x48 when stereo, but blocked/interleave layout don't understand stereo codecs
             return 0x24; //vgmstream->channels==1 ? 0x24 : 0x48;
-        case coding_XBOX_IMA_int:
+        case coding_XBOX_IMA_mono:
         case coding_WWISE_IMA:
         case coding_CD_IMA:
             return 0x24;
@@ -693,7 +693,7 @@ int decode_get_frame_size(VGMSTREAM* vgmstream) {
             return 0x4c*vgmstream->channels;
 
         case coding_MSADPCM:
-        case coding_MSADPCM_int:
+        case coding_MSADPCM_mono:
         case coding_MSADPCM_ck:
             return vgmstream->frame_size;
         case coding_WS:
@@ -934,7 +934,7 @@ void decode_vgmstream(VGMSTREAM* vgmstream, int samples_written, int samples_to_
             }
             break;
         case coding_XBOX_IMA:
-        case coding_XBOX_IMA_int: {
+        case coding_XBOX_IMA_mono: {
             int is_stereo = (vgmstream->channels > 1 && vgmstream->coding_type == coding_XBOX_IMA);
             for (ch = 0; ch < vgmstream->channels; ch++) {
                 decode_xbox_ima(&vgmstream->ch[ch], buffer+ch,
@@ -1334,8 +1334,8 @@ void decode_vgmstream(VGMSTREAM* vgmstream, int samples_written, int samples_to_
             decode_nwa(vgmstream->codec_data, buffer, samples_to_do);
             break;
         case coding_MSADPCM:
-        case coding_MSADPCM_int:
-            if (vgmstream->channels == 1 || vgmstream->coding_type == coding_MSADPCM_int) {
+        case coding_MSADPCM_mono:
+            if (vgmstream->channels == 1 || vgmstream->coding_type == coding_MSADPCM_mono) {
                 for (ch = 0; ch < vgmstream->channels; ch++) {
                     decode_msadpcm_mono(vgmstream,buffer+ch,
                             vgmstream->channels,vgmstream->samples_into_block, samples_to_do, ch,

src/base/info.c

@@ -128,9 +128,10 @@ void describe_vgmstream(VGMSTREAM* vgmstream, char* desc, int length) {
         int32_t frame_size = vgmstream->frame_size > 0 ? vgmstream->frame_size : vgmstream->interleave_block_size;
         switch (vgmstream->coding_type) {
             case coding_MSADPCM:
-            case coding_MSADPCM_int:
+            case coding_MSADPCM_mono:
             case coding_MSADPCM_ck:
             case coding_MS_IMA:
+            case coding_MS_IMA_mono:
             case coding_MC3:
             case coding_WWISE_IMA:
             case coding_REF_IMA:
@@ -232,9 +233,10 @@ void describe_vgmstream_info(VGMSTREAM* vgmstream, vgmstream_info* info) {
         int32_t frame_size = vgmstream->frame_size > 0 ? vgmstream->frame_size : vgmstream->interleave_block_size;
         switch (vgmstream->coding_type) {
         case coding_MSADPCM:
-        case coding_MSADPCM_int:
+        case coding_MSADPCM_mono:
         case coding_MSADPCM_ck:
         case coding_MS_IMA:
+        case coding_MS_IMA_mono:
         case coding_MC3:
         case coding_WWISE_IMA:
         case coding_REF_IMA:

src/coding/acm_decoder.c

@@ -1,5 +1,5 @@
 #include "coding.h"
-#include "acm_decoder_libacm.h"
+#include "libs/libacm.h"
 #include <stdio.h>
 
 /* libacm 1.2 (despite what libacm.h says) from: https://github.com/markokr/libacm */

src/coding/circus_decoder.c

@@ -1,5 +1,5 @@
 #include "coding.h"
-#include "circus_decoder_lib.h"
+#include "libs/circus_vq_lib.h"
 
 
 

src/coding/coding.h

@@ -5,7 +5,7 @@
 #include "../util/reader_sf.h"
 #include "../util/reader_get_nibbles.h"
 //todo remove
-#include "hca_decoder_clhca.h"
+#include "libs/clhca.h"
 
 /* adx_decoder */
 void decode_adx(VGMSTREAMCHANNEL* stream, sample_t* outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do, int32_t frame_bytes, coding_t coding_type, uint32_t codec_config);

src/coding/compresswave_decoder.c

@@ -1,6 +1,6 @@
 #include "coding.h"
 #include "coding_utils_samples.h"
-#include "compresswave_decoder_lib.h"
+#include "libs/compresswave_lib.h"
 
 
 #define COMPRESSWAVE_MAX_FRAME_SAMPLES  0x1000  /* arbitrary but should be multiple of 2 for 22050 mode */

src/coding/g7221_decoder.c

@@ -1,7 +1,7 @@
 #include "coding.h"
 
 #ifdef VGM_USE_G7221
-#include "g7221_decoder_lib.h"
+#include "libs/g7221_lib.h"
 
 #define G7221_MAX_FRAME_SIZE 0x78   /* 960/8 */
 #define G7221_MAX_FRAME_SAMPLES 640 /* 32000/50 */

src/coding/hca_decoder.c

@@ -1,5 +1,5 @@
 #include "coding.h"
-#include "hca_decoder_clhca.h"
+#include "libs/clhca.h"
 
 
 struct hca_codec_data {

src/coding/ice_decoder.c

@@ -1,5 +1,5 @@
 #include "coding.h"
-#include "ice_decoder_icelib.h"
+#include "libs/icelib.h"
 
 
 typedef struct {

src/coding/circus_decoder_lib_data.h → src/coding/libs/circus_vq_data.h

@@ -1,5 +1,5 @@
-#ifndef _CIRCUS_DECODER_LIB_DATA_H_
-#define _CIRCUS_DECODER_LIB_DATA_H_
+#ifndef _CIRCUS_VQ_DATA_H_
+#define _CIRCUS_VQ_DATA_H_
 
 #include <stdint.h>
 

src/coding/circus_decoder_lib.c → src/coding/libs/circus_vq_lib.c

@@ -14,14 +14,14 @@
  * https://bitbucket.org/losnoco/foo_adpcm/src/master/foo_oki/source/libpcm/libpcm.cpp
  */
 
-#include "circus_decoder_lib.h"
-#include "circus_decoder_lib_data.h"
+#include "circus_vq_lib.h"
+#include "circus_vq_data.h"
 
-#include "circus_decoder_lzxpcm.h"
+#include "circus_vq_lzxpcm.h"
 
 /* use miniz (API-compatible) to avoid adding external zlib just for this codec
  * - https://github.com/richgel999/miniz */
-#include "../util/miniz.h"
+#include "../../util/miniz.h"
 //#include "zlib.h"
 
 

src/coding/circus_decoder_lib.h → src/coding/libs/circus_vq_lib.h

@@ -1,7 +1,7 @@
-#ifndef _CIRCUS_DECODER_LIB_H_
-#define _CIRCUS_DECODER_LIB_H_
+#ifndef _CIRCUS_VQ_LIB_H_
+#define _CIRCUS_VQ_LIB_H_
 
-#include "../streamfile.h"
+#include "../../streamfile.h"
 
 typedef struct circus_handle_t circus_handle_t;
 

src/coding/circus_decoder_lzxpcm.h → src/coding/libs/circus_vq_lzxpcm.h

@@ -1,3 +1,6 @@
+#ifndef _CIRCUS_VQ_LZXPCM_H_
+#define _CIRCUS_VQ_LZXPCM_H_
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -295,3 +298,5 @@ static int lzxpcm_decompress_full(uint8_t* dst, size_t dst_size, const uint8_t*
     return 0;
 }
 #endif
+
+#endif

src/coding/hca_decoder_clhca.c → src/coding/libs/clhca.c

@@ -25,7 +25,7 @@
 //--------------------------------------------------
 // Includes
 //--------------------------------------------------
-#include "hca_decoder_clhca.h"
+#include "clhca.h"
 #include <stddef.h>
 #include <stdlib.h>
 #include <memory.h>

src/coding/hca_decoder_clhca.h → src/coding/libs/clhca.h

@@ -1,9 +1,5 @@
-#ifndef _clHCA_H
-#define _clHCA_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef _CLHCA_H_
+#define _CLHCA_H_
 
 
 /* Must pass at least 8 bytes of data to this function.
@@ -86,8 +82,4 @@ int clHCA_TestBlock(clHCA *hca, void *data, unsigned int size);
  * Without it there are minor differences, mainly useful when testing a new key. */
 void clHCA_DecodeReset(clHCA * hca);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

src/coding/compresswave_decoder_lib.c → src/coding/libs/compresswave_lib.c

@@ -1,4 +1,4 @@
-#include "compresswave_decoder_lib.h"
+#include "compresswave_lib.h"
 #include <math.h>
 #include <stdint.h>
 #include <stdlib.h>

src/coding/compresswave_decoder_lib.h → src/coding/libs/compresswave_lib.h

@@ -1,6 +1,6 @@
-#ifndef _COMPRESSWAVE_DECODER_LIB_H
-#define _COMPRESSWAVE_DECODER_LIB_H
-#include "../streamfile.h"
+#ifndef _COMPRESSWAVE_LIB_H
+#define _COMPRESSWAVE_LIB_H
+#include "../../streamfile.h"
 
 typedef struct TCompressWaveData TCompressWaveData;
 
@@ -24,4 +24,4 @@ float TCompressWaveData_GetFade(TCompressWaveData* this);
 float TCompressWaveData_GetPlayTime(TCompressWaveData* this);
 float TCompressWaveData_GetTotalTime(TCompressWaveData* this);
 
-#endif /*_COMPRESSWAVE_DECODER_LIB_H */
+#endif /*_COMPRESSWAVE_LIB_H */

src/coding/g7221_decoder_aes.c → src/coding/libs/g7221_aes.c

@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include "g7221_decoder_aes.h"
+#include "g7221_aes.h"
 
 /* Namco's NUS AES is just standard AES-192 in ECB mode, so this can be swapped with another lib,
  * if more code needs AES. Most implementations out there either use pre-calculated look-up tables,

src/coding/g7221_decoder_lib_data.h → src/coding/libs/g7221_data.h

@@ -1,5 +1,5 @@
-#ifndef _DATA_H_
-#define _DATA_H_
+#ifndef _G7221_DATA_H_
+#define _G7221_DATA_H_
 
 #include <stdint.h>
 

src/coding/g7221_decoder_lib.c → src/coding/libs/g7221_lib.c

@@ -2,9 +2,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "g7221_decoder_lib.h"
-#include "g7221_decoder_aes.h"
-
+#include "g7221_lib.h"
+#include "g7221_aes.h"
+#include "g7221_data.h"
 
 /* Decodes Siren14 from Namco's BNSF, a mono MLT/DCT-based codec for speech/sound (low bandwidth).
  * Reverse engineered for various exes with info from Polycom's reference int decoder.
@@ -46,8 +46,6 @@
  *       access indexes with (idx & max) and clamp buffer reads
  */
 
-#include "g7221_decoder_lib_data.h"
-
 /*****************************************************************************
  * IMLT
  *****************************************************************************/

src/coding/g7221_decoder_lib.h → src/coding/libs/g7221_lib.h

@@ -1,8 +1,8 @@
 /*
     Interface to Namco G.722.1 decoder
 */
-#ifndef _G7221_DECODER_LIB_H
-#define _G7221_DECODER_LIB_H
+#ifndef _G7221_LIB_H
+#define _G7221_LIB_H
 
 #include <stdint.h>
 

src/coding/ice_decoder_icelib.c → src/coding/libs/icelib.c

@@ -26,11 +26,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "ice_decoder_icelib.h" 
+#include "icelib.h" 
 
 /* use miniz (API-compatible) to avoid adding external zlib just for this codec
  * - https://github.com/richgel999/miniz */
-#include "../util/miniz.h" 
+#include "../../util/miniz.h" 
 //#include "zlib.h"
 
 #define ICESND_MAX_CHANNELS    2

src/coding/acm_decoder_decode.c → src/coding/libs/libacm_decode.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "acm_decoder_libacm.h" //"libacm.h"//vgmstream mod
+#include "libacm.h"
 
 #define ACM_BUFLEN	(64*1024)
 

src/coding/acm_decoder_util.c → src/coding/libs/libacm_util.c

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "acm_decoder_libacm.h" //"libacm.h"//vgmstream mod
+#include "libacm.h"
 
 #define WAVC_HEADER_LEN	28
 #define ACM_HEADER_LEN	14