Commit Graph

1340 Commits

Author SHA1 Message Date
bnnm
bcf93deecd Extend ffmpeg's make_riff_xma_from_fmt/fmt_chunk_swap_endian for XMA1 2017-03-19 00:43:31 +01:00
bnnm
e021cff626 Add some XMA meta descriptions 2017-03-18 19:26:39 +01:00
bnnm
891baff263 More minor file renames (cleanup) 2017-03-18 18:40:46 +01:00
bnnm
2d8ae43fa7 Rename nub to nub_vag and some cleanup 2017-03-18 18:30:22 +01:00
bnnm
aa9c64d747 Minor renames 2017-03-18 18:25:44 +01:00
bnnm
fe54a36b93 Rename ps3_sgh_sgb to sgxd (cleanup) 2017-03-18 17:55:35 +01:00
bnnm
e5b384ea40 Rename ps3_vawx to vawx (cleanup) 2017-03-18 17:53:19 +01:00
bnnm
a8fea8f35c Fix Malicious PS3 looping 2017-03-18 17:41:45 +01:00
bnnm
a4327c3529 Improve total_streams check 2017-03-18 17:17:24 +01:00
bnnm
d6ce0f0ae3 Fix SGXD typo (SGDX to SGXD) 2017-03-18 15:07:58 +01:00
bnnm
76a351c7e2 Add minor debug log when looping is auto-disabled 2017-03-18 00:24:36 +01:00
bnnm
14d4cd8651 Add XWB size check; Techland's ATRAC3 [Nail'd, Sniper Ghost Warrior PS3] 2017-03-18 00:22:20 +01:00
bnnm
1a2083ad6f Added Ukiyo no Roushi vag variation 2017-03-18 00:19:35 +01:00
Christopher Snowhill
00523fb5ab Merge pull request #74 from bnnm/fsb-mpeg-bfstm
FSB MPEG, BFSTM
2017-03-13 18:29:50 -07:00
bnnm
d13d03e573 Add little endian BFSTM [Blaster Master Zero (3DS)] 2017-03-13 21:19:38 +01:00
bnnm
de523dc6a3 Do some cleanup while we are testing BFSTMs 2017-03-13 21:14:14 +01:00
bnnm
0c55e49a63 More FSB5 flags comments 2017-03-13 20:43:47 +01:00
bnnm
0cf5d4fb00 Add FSB5 XMA; use interleaved MPEGs; fix mono MPEG total samples 2017-03-13 20:08:35 +01:00
bnnm
5763a1a229 Use interleaved MPEG FSB decoder [Timeshift, DJ Hero] 2017-03-13 20:05:28 +01:00
bnnm
0e10b75beb Fix interleaved FSB MPEG decoding
Padding doesn't apply to Layer II FSBs, and it needed to manually get
info from MPEG frames since mpg123 functions weren't always working.
2017-03-13 20:04:09 +01:00
Christopher Snowhill
698269dd14 Convert Japanese comments from EUCJP to UTF-8. 2017-03-12 22:19:22 -07:00
bnnm
1a0da46703 Some more IMA cleanup (no functional changes) 2017-03-10 18:08:12 +01:00
bnnm
ae26d35f0c Improve handling of different lengths in check_extensions 2017-03-10 17:57:28 +01:00
bnnm
663cb43b3f Make init_vgmstream_hca_offset local (wasn't used anywhere else) 2017-03-10 17:32:42 +01:00
bnnm
79a5942cb9 Add HCA extension check to avoid some malloc/frees 2017-03-10 17:26:27 +01:00
bnnm
b8a25dbc27 Some IMA cleanup (no functional changes) 2017-03-09 21:47:23 +01:00
bnnm
8fc73c6d02 Minor SCD cleanup 2017-03-09 20:56:26 +01:00
bnnm
613766e856 Add comment 2017-03-09 20:38:52 +01:00
bnnm
a5556e587c Added "short" MPDS (coefs missing) [T3, MI: Operation Surma (GC)] 2017-03-09 20:37:48 +01:00
bnnm
ce591bbe12 Added new GENH codecs: ATRAC3/plus, XMA1/2, FFMPEG
Also some extra fields: total samples, skip samples, data size,
atrac3/xma modes
2017-03-09 19:33:31 +01:00
bnnm
2cdef093cb Added FFmpeg fake atrac3plus RIFF 2017-03-09 19:13:05 +01:00
bnnm
098946057e Do some GENH cleanup before further additions
No changes in logic (tested for all types):
- move codec types to enum for later reference
- move NGC_DTK validation and AICA/DSP adpcm init to setup block
- use vgmstream_open_stream instead of manual stream opening.
  There were 2 cases, interleave (different offset per channel, multiple
streamfiles) and none (same offsets per channel, one streamfile), now
handled by it.
2017-03-09 16:53:34 +01:00
bnnm
0e658031cc Add basic multistream FSB5 support; code cleanup 2017-03-05 17:43:41 +01:00
bnnm
af0c31d61f Minor tweaks/log 2017-03-05 17:35:45 +01:00
bnnm
7f90359e40 Fix some XWB XACT2 looping [Blue Dragon, Prey] 2017-03-05 17:34:37 +01:00
bnnm
9d97a346d3 Save number of streams info 2017-03-04 02:16:35 +01:00
bnnm
39abb97b61 Save number of streams info 2017-03-04 02:09:00 +01:00
bnnm
93bcf85e9c Minor code cleanup 2017-03-04 02:07:48 +01:00
bnnm
3d1ae80f56 Fixed SFX SGDXs; show multi stream number 2017-03-04 02:06:11 +01:00
bnnm
85a3ec749f Show stream numbers in the description (few multi-stream formats only) 2017-03-04 02:05:07 +01:00
bnnm
f92babb383 Fix looping for XACT1/2 PCM and XMA 2017-02-25 19:53:21 +01:00
bnnm
d2a31378c2 move xma_get_samples from xma.c to FFmpeg utils (needed by XWB)
xma.c now uses ffmpeg's fmt_chunk_swap_endian, too
2017-02-25 19:52:07 +01:00
bnnm
8b72e32a97 Adjust XMA sample reader (cleanup, looping, prep for changes) 2017-02-25 18:35:56 +01:00
bnnm
fbb9af5410 Tweak FFmpeg XMA1 fake RIFF 2017-02-25 17:29:25 +01:00
bnnm
0296be392f Redone XWB with full support [many XBOX360 games]
Includes PCM/XBOX-ADPCM/MS-ADPCM/XMA1/XMA2/WMAv1/WMAv2/WMApro.
Known issues (examples needed):
- PCM8bit, WMAv1 (XBOX) and WMApro (late XBOX360) not tested
- compact mode not tested
- earlier (XACT2) MS-ADPCM looping not tested
- XACT2 v35/36/37 may not play correctly (~few mid 2006 games)
2017-02-25 13:57:18 +01:00
bnnm
04f2cb0344 Moved FFmpeg RIFF utils to their own file
I'm going to add more later so it was getting kind of unwieldy
2017-02-25 13:54:05 +01:00
bnnm
9ff0e2b8a7 Fix again rare FFmpeg bug when reading "fake" filesizes 2017-02-25 13:43:05 +01:00
bnnm
248ec021d8 Add FFmpeg fake riff helpers: XMA1, XWMA, XMA2 tweaks 2017-02-25 12:25:10 +01:00
Christopher Snowhill
223f732e17 Merge pull request #70 from bnnm/interleaved-mpeg
Interleaved MPEG
2017-02-19 21:41:42 -08:00
bnnm
7f98f5b4f6 Remove MPEG sample rate check and channel/sample rate pointer updates
Rarely used, frame sample rate/channels are now exposed, and FFmpeg will
end up playing any MP3 anyway.
Encoders may modify sample rate to adjust looping to frame boundaries,
too.
2017-02-19 21:16:09 +01:00
bnnm
f993fe37de Add some preliminar code for multichannel FSBs 2017-02-19 20:28:13 +01:00
bnnm
c38aa72761 Enable multichannel MPEG (fixed frame size) in XVAGs 2017-02-19 20:21:57 +01:00
bnnm
0101572718 Add multichannel MPEG decoder
Supports fixed-size frames (for XVAG) or variable/padded frames (for
FSB), but FSB support has some bugs so it's not used yet.
2017-02-19 20:20:13 +01:00
bnnm
e0d129e06c Prepare MPEG stuff for multichannel 2017-02-18 18:27:21 +01:00
bnnm
d3a1fba917 Simplify XVAG/code cleanup preparations 2017-02-18 15:43:29 +01:00
bnnm
4673050fcb Add find_chunk with configurable endianness 2017-02-18 15:19:25 +01:00
Link
4963e97216 Fairy Fencer F: Advent Dark Force Looping OGG support added. 2017-02-18 08:04:16 +01:00
bnnm
7418b61793 Hide buffer and mpeg_bytes_to_samples MPEG internals; cleanup
Also removes VBR check from metas; it's only needed because
mpeg_bytes_to_samples doesn't work with VBR, but now it'll return 0,
which would be validated later.
2017-02-18 00:17:38 +01:00
bnnm
2e41586e68 Move AHX MPEG init code to mpeg_decoder and other cleanup 2017-02-17 18:35:58 +01:00
bnnm
6b99cf8f72 Use free_mpeg to close MPEG internals 2017-02-17 18:18:06 +01:00
bnnm
df84602e85 Move reset/seek/free MPEG code to mpeg_decoder (for later changes) 2017-02-17 17:20:40 +01:00
bnnm
a7982bc743 Remove MPEG internals 2017-02-17 16:48:29 +01:00
bnnm
ef5b17f508 Remove old FSB5 mpeg code 2017-02-17 16:44:07 +01:00
bnnm
5b04bbc32a Add a couple of extra memory validations on BIK init 2017-02-17 16:39:38 +01:00
bnnm
d26c813cbd Fix some rare AKB2 [Mobius FF SFX] 2017-02-12 15:43:57 +01:00
bnnm
b661996313 Relax loop validation [ESPN 2002] 2017-02-12 15:00:10 +01:00
bnnm
b3ca092b6a Add AKB support for OGG/alt AAC [SQEX iOS: Dragon Quest 2-6, FF6, TWEWY] 2017-02-12 14:42:02 +01:00
bnnm
9317ce9cc2 Add ffmpeg_set_skip_samples to manually fix encoder delay in some cases 2017-02-12 13:17:01 +01:00
bnnm
8d973f4eb9 Allow negative start time in init_seek (for Ogg) 2017-02-12 12:18:44 +01:00
Christopher Snowhill
520cb97b34 Merge branch 'master' of github.com:kode54/vgmstream 2017-02-04 16:59:24 -08:00
bnnm
5040b4746e Fix minor bugs; cleanup
- loop flag parsed from the spec [TTT HD]
- add joint stereo ATRAC3 [Silent Hill HD]
- fix MSFv1 ATRAC3 sample rate [Digi World SP]
- use "fake RIFF" ATRAC3 for flexibility (sample rate fix)
2017-02-04 23:26:13 +01:00
bnnm
3d9ce4c15e Fixed FSB5 sample rate and channels, multichannel IMA ADPCM; cleanup 2017-02-04 23:20:11 +01:00
bnnm
cc181f5e0d Added FSB multichannel IMA 2017-02-04 23:17:56 +01:00
bnnm
b44cd87a7b Fix multichannel IMA FSB 2017-02-04 19:37:48 +01:00
bnnm
b7ee1f8f02 Add todo/note in XBOX IMAs 2017-02-04 19:37:00 +01:00
bnnm
6cd991ebf6 Added FSB multichannel IMA
Variation of the XBOX IMA used in >2ch FSB (interleaved header)
2017-02-04 19:19:51 +01:00
bnnm
13bec0d5be Add check in free_ffmpeg to avoid segfault if data is NULL
free() accepts NULL so free_ffmpeg should too, I guess
2017-02-04 17:54:43 +01:00
bnnm
2aa025f245 Added BIK/BIKa 1/2 [various game movies] 2017-02-04 13:00:13 +01:00
bnnm
bc49757f20 Added/finished looping MP4 (.lmp4) [FFDimensions, Tales of Hearts R iOS] 2017-02-04 11:10:02 +01:00
bnnm
bcc60c3b64 Added buffer logging debug util 2017-02-04 11:06:35 +01:00
Christopher Snowhill
16d2532c6f Added Release2015 target to projects. 2017-02-03 22:01:21 -08:00
bnnm
d8df47e080 Simplify SGXD code 2017-01-28 00:41:51 +01:00
bnnm
a468e9b1b1 Fix stream and interleave sizes in some cases 2017-01-27 23:39:52 +01:00
bnnm
c3490f99d9 Fix a rare FFmpeg bug when reading "fake" filesizes 2017-01-27 23:16:00 +01:00
bnnm
685c7bafad Fix MSA sample count [Psyvariar (PS2)] 2017-01-27 19:32:40 +01:00
bnnm
7e106d6a33 Add basic multistream FSB support 2017-01-27 18:01:40 +01:00
bnnm
45bd8a37cb Allow looping in IDSPs with loop_end over num_samples 2017-01-27 16:19:08 +01:00
bnnm
802e414bdc Fix mono Xbox decoding, mono DSP start_offset; code cleanup 2017-01-26 23:31:02 +01:00
bnnm
dfa9edea76 Remove unneeded/buggy stream-closing code in vgmstream_open_stream 2017-01-25 22:31:28 +01:00
bnnm
35a3d44c89 Move Xenoblade 3D DSP .adx from CRI .adx to its own meta (cleanup)
The CRI .adx code is now like before it was added (44075c4)
2017-01-25 22:28:15 +01:00
bnnm
195958b20a Move Xenoblade 3D DSP .adx from CRI .adx to its own meta (cleanup) 2017-01-25 22:23:45 +01:00
bnnm
068284ff09 Add dsp_read_coefs_le 2017-01-25 22:20:01 +01:00
bnnm
9ae63e470b Add .str extension for Ben 10: Galactic Racing 2017-01-25 20:36:57 +01:00
bnnm
a809a7c628 Add Omikron: The Nomad Soul IMA ADPCM coding and meta 2017-01-25 20:25:39 +01:00
bnnm
1d95cfc138 Normalize coding style to understand IMAs better + highlight differences
There are no functional differences, all IMAs give byte-exact results
compared to prev versions
2017-01-25 20:19:13 +01:00
bnnm
28dc316f95 Add NPS extension (Beautiful Katamari) 2017-01-22 11:40:01 +01:00
bnnm
b726349ece Fix multistream count offset [Dragon Quest X SFX] 2017-01-19 00:33:12 +01:00
bnnm
78349c3c8f Move "skip chunks" to OGG, only FFXIV needs it and breaks some DQ10 DSPs 2017-01-19 00:29:55 +01:00
bnnm
11968a5593 Add support for WiiBGM demuxed from G1L [Romance of Three Kingdoms 12] 2017-01-18 21:28:14 +01:00
bnnm
ef44b5b5cc SCD DSP: validate size/offset and don't crash when failing to open 2017-01-18 21:19:43 +01:00
Christopher Snowhill
f47fabab9a Fix another regression caused by ee5a40224d deleting return statements that other switch cases fell into. 2017-01-17 10:37:47 -08:00
Christopher Snowhill
05a33eee1e And this fixes that broken decoder in the event of starting on odd samples. 2017-01-16 22:26:08 -08:00
bnnm
9cea79eedc Adjust minor vgmstream_open_stream condition 2017-01-15 22:16:28 +01:00
bnnm
295fcf1b8a Improve buffer usage in some cases when using vgmstream_open_stream 2017-01-15 21:02:01 +01:00
bnnm
782c5927f6 Cache filesize and check when reading over filesize
Improves performance especially for buggy metas (before it would try to
fread every streamfile.read call when offset > filesize)
2017-01-15 20:58:47 +01:00
bnnm
30ec4d7c41 Increase default I/O buffer to improve performance 2017-01-15 20:48:00 +01:00
bnnm
cba1d28ae2 Fixed regression in Xbox codecs 2017-01-15 20:44:52 +01:00
bnnm
85e63743b7 Added SCD DSP Wii U [Dragon Quest X (Wii U)] 2017-01-15 20:42:26 +01:00
Christopher Snowhill
efdbf8c331 Merge pull request #61 from bnnm/formats-stuff
Formats and stuff
2017-01-14 14:16:16 -08:00
bnnm
72f252327f Added SCD ATRAC3plus [Lord of Arcana (PSP)] 2017-01-14 23:00:19 +01:00
bnnm
2d52bc2921 Wrong func definition 2017-01-14 22:41:37 +01:00
bnnm
07c179e51c Remove unused init_ffmpeg_faux_riff
Superseded by init_ffmpeg_header_offset and various ffmpeg_make_riff_x
2017-01-14 22:29:47 +01:00
bnnm
d3ba419aa9 Fixed SCD XMA [Final Fantasy XIII (X360)] 2017-01-14 22:27:52 +01:00
bnnm
376b4acbb2 Minor func rename (ffmpeg_make_riff_xma2_from_fmt) 2017-01-14 22:25:15 +01:00
bnnm
7f02c9951d Fixed 6ch "multi" IDSP [Tekken Tag Tournament 2 (Wii U)] 2017-01-14 21:21:39 +01:00
derselbst
088aa2414f avoid format-security compiler warnings 2017-01-14 16:23:59 +01:00
bnnm
a1f8407ab1 Fixed GSP+GSB DSP total samples [Super Swing Golf GC] 2017-01-14 03:05:07 +01:00
bnnm
b96e7d7bbf Added ATRAC3/XMA in GSP/GSB [Quantum Theory PS3/X360] 2017-01-14 01:39:21 +01:00
bnnm
48fa7b7dc0 Added a few helper functions
- open_stream_ext: opens a streamfile based on the filename + ext
- find_chunk_be/le: finds chunk_offset in chunked headers
2017-01-14 01:37:53 +01:00
bnnm
afed5c2e15 Deleted header.c (in the end not really useful or needed) 2017-01-14 01:32:04 +01:00
bnnm
c68608149c Moved check_extensions/open_stream to streamfile.c/vgmstream.c 2017-01-14 00:59:54 +01:00
bnnm
747ee30992 Add missing meta description 2017-01-14 00:13:50 +01:00
bnnm
b99e37f170 Moved make_wav_header from util.c to test.c (only used there) 2017-01-14 00:10:45 +01:00
bnnm
14d2363670 Moved dsp_read_coefs_be to ngc_dsp_decoder.c 2017-01-13 23:56:48 +01:00
bnnm
f5750ba2cc Moved make_riff_x to ffmpeg_decoder.c (only actually used by FFmpeg)
Also added make_riff_xma2_from_fmt_be
2017-01-13 23:47:52 +01:00
Christopher Snowhill
72f3e3555b Added sanity check to MCA decoder, fixes some odd rips I've just encountered. 2017-01-09 09:29:08 -08:00
Christopher Snowhill
b1e81c8682 Fix typographical error. 2017-01-08 12:56:01 -08:00
bnnm
2467f9afdc Added CXS [Eternal Sonata (Xbox 360)] 2017-01-08 14:19:32 +01:00
bnnm
013d43cccc Add VDS/VDM 2017-01-08 13:04:23 +01:00
bnnm
01981a6686 Added PS2 VDS/VDM [Graffiti Kingdom] 2017-01-08 12:59:04 +01:00
bnnm
4e6ce8747d Added .swag [Frantix PSP] 2017-01-08 12:03:31 +01:00
bnnm
86ba7a6a23 Remove some old DEBUG code 2017-01-08 02:58:52 +01:00
bnnm
7e520162a3 FFmpeg: remove ACCURATE_LOOPING flag now it's battle-tested
It's fast enough and the older looping code would need to be redone
anyway
2017-01-08 02:54:18 +01:00
bnnm
ad74cced1f Moved coding/layout/meta switch-case descriptions to list in formats.c 2017-01-08 02:27:35 +01:00
bnnm
c7c1564d9f Minor cleanups (no functionality changes)
- added comments, code alignment for clarity
- renamed some decoders for consistency (ex. eaxa > ea_xa, invert_psx >
psx_bmdx, vgm_adpcm_cfg > psx_cfg)
- removed layout_dkt_interleave (same as nolayout)
- removed skip_last_channel (not used anymore)
- removed meta_DSP_HALP (not used anymore)
2017-01-08 01:09:20 +01:00
bnnm
3e4299b373 Added ATRAC3/XMA in VAWX (.xwv) [Moon Diver, No More Heroes X360] 2017-01-07 17:04:21 +01:00
bnnm
03d744da53 Add make_riff_atrac3 (for FFmpeg) 2017-01-07 16:51:23 +01:00
bnnm
2557074ceb Added .nps extension [Venus & Braves PS2] 2017-01-07 14:33:10 +01:00
bnnm
8b8a9ecd4e Basic support for multi-stream SCD (FF XIV sfx) 2017-01-03 21:13:36 +01:00
bnnm
8913ccdd47 Add SCD OGG v3 decryption (FF XIV Heavensward)
Original code by ShadowRoze and algorithm by Ioncannon.
2017-01-03 19:03:08 +01:00
bnnm
119f24a5be Add .aa3 and .oma (demuxed PS3 movies) 2017-01-03 15:52:08 +01:00
bnnm
cc5657f9c9 Remove unused concatn_doublenull / concatn_fitting_doublenull 2017-01-03 15:02:42 +01:00
bnnm
dce063bb96 Add a single, unified format list; plugins build their own using it
To simplify adding new formats, for now it's a simple list and could
improve later. Some missing formats were indirectly added:
- Winamp: aifcl
- foobar: aifcl, b1s, bdsp, ffw, iadp, wb, xag
- XMPlay: many
2017-01-03 13:34:20 +01:00
Christopher Snowhill
8ef18d71ee Fix C99-ism that MSVC 2010 doesn't like. 2017-01-02 10:27:27 -08:00
bnnm
5b70e3688b Adjusted .h and stream opener 2017-01-02 17:05:01 +01:00
bnnm
aaf137817c IMA tweaks 2017-01-02 17:03:49 +01:00
bnnm
6fa660c1a3 Define strncasecmp for MSC 2017-01-02 15:43:10 +01:00
bnnm
a77d4d21ce Manually setting layout_none was not needed in mono PCM files 2017-01-02 15:42:26 +01:00
bnnm
9d33b42584 Improved SPW (PCM, sample rate) 2017-01-02 15:24:10 +01:00
bnnm
ee5a40224d Added PS ADPCM of configurable frame size (FF XI, Blur, Afrika)
This fuses the FF XI/BSF/Short VAG decoder variants into a single one
(FF XI alone has 4 possible frame sizes); also fixed FF XI sample rate
and some cleanup.
2016-12-29 23:34:21 +01:00