Add proper .baf [Project Gotham Racing 4 (X360), Geometry Wars (PC)]

src/coding/coding.h

@@ -343,6 +343,7 @@ void xma2_parse_fmt_chunk_extra(STREAMFILE *streamFile, off_t chunk_offset, int
 void xma2_parse_xma2_chunk(STREAMFILE *streamFile, off_t chunk_offset, int * channels, int * sample_rate, int * loop_flag, int32_t * num_samples, int32_t * loop_start_sample, int32_t * loop_end_sample);
 
 void xma_fix_raw_samples(VGMSTREAM *vgmstream, STREAMFILE*streamFile, off_t stream_offset, size_t stream_size, off_t chunk_offset, int fix_num_samples, int fix_loop_samples);
+void xma_fix_raw_samples_ch(VGMSTREAM *vgmstream, STREAMFILE*streamFile, off_t stream_offset, size_t stream_size, int channel_per_stream, int fix_num_samples, int fix_loop_samples);
 
 int riff_get_fact_skip_samples(STREAMFILE * streamFile, off_t start_offset);
 

src/coding/coding_utils.c

@@ -799,14 +799,13 @@ void wma_get_samples(ms_sample_data * msd, STREAMFILE *streamFile, int block_ali
 /* XMA hell for precise looping and gapless support, fixes raw sample values from headers
  * that don't count XMA's final subframe/encoder delay/encoder padding, and FFmpeg stuff.
  * Configurable since different headers vary for maximum annoyance. */
-void xma_fix_raw_samples(VGMSTREAM *vgmstream, STREAMFILE*streamFile, off_t stream_offset, size_t stream_size, off_t chunk_offset, int fix_num_samples, int fix_loop_samples) {
+void xma_fix_raw_samples_ch(VGMSTREAM *vgmstream, STREAMFILE*streamFile, off_t stream_offset, size_t stream_size, int channels_per_stream, int fix_num_samples, int fix_loop_samples) {
     const int bytes_per_packet = 2048;
     const int samples_per_frame = 512;
     const int samples_per_subframe = 128;
     const int bits_frame_size = 15;
 
     int xma_version = 2; /* works ok even for XMA1 */
-    int channels_per_stream = xma_get_channels_per_stream(streamFile, chunk_offset, vgmstream->channels);
     off_t first_packet = stream_offset;
     off_t last_packet = stream_offset + stream_size - bytes_per_packet;
     int32_t start_skip = 0, end_skip = 0;
@@ -872,6 +871,12 @@ void xma_fix_raw_samples(VGMSTREAM *vgmstream, STREAMFILE*streamFile, off_t stre
 #endif
 }
 
+void xma_fix_raw_samples(VGMSTREAM *vgmstream, STREAMFILE*streamFile, off_t stream_offset, size_t stream_size, off_t chunk_offset, int fix_num_samples, int fix_loop_samples) {
+    int channels_per_stream = xma_get_channels_per_stream(streamFile, chunk_offset, vgmstream->channels);
+    xma_fix_raw_samples_ch(vgmstream, streamFile, stream_offset, stream_size, channels_per_stream, fix_num_samples, fix_loop_samples);
+}
+
+
 /* ******************************************** */
 /* HEADER PARSING                               */
 /* ******************************************** */

src/formats.c

@@ -998,7 +998,7 @@ static const meta_info meta_info_list[] = {
         {meta_PS3_CPS,              "tri-Crescendo CPS Header"},
         {meta_SQEX_SCD,             "Square-Enix SCD header"},
         {meta_NGC_NST_DSP,          "Animaniacs NST header"},
-        {meta_BAF,                  ".baf WAVE header"},
+        {meta_BAF,                  "Bizarre Creations .baf header"},
         {meta_PS3_MSF,              "Sony MSF header"},
         {meta_NUB_VAG,              "Namco NUB VAG header"},
         {meta_PS3_PAST,             "SNDP header"},

src/meta/baf.c

@@ -1,9 +1,189 @@
 #include "meta.h"
+#include "../coding/coding.h"
 
-/* .BAF - Bizarre Creations (Blur, James Bond 007: Blood Stone, etc) */
+
+/* .BAF - Bizarre Creations bank file [Blur (PS3), Project Gotham Racing 4 (X360), Geometry Wars (PC)] */
 VGMSTREAM * init_vgmstream_baf(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
-    off_t WAVE_size, DATA_size;
+    off_t start_offset, header_offset, name_offset;
+    size_t stream_size;
+    int loop_flag, channel_count, sample_rate, version, codec;
+    int total_subsongs, target_subsong = streamFile->stream_index;
+    int32_t (*read_32bit)(off_t,STREAMFILE*);
+
+
+    /* checks */
+    if (!check_extensions(streamFile, "baf"))
+        goto fail;
+    if (read_32bitBE(0x00,streamFile) != 0x42414E4B) /* "BANK" */
+        goto fail;
+
+    /* use BANK size to check endianness */
+    if (guess_endianness32bit(0x04,streamFile)) {
+        read_32bit = read_32bitBE;
+    } else {
+        read_32bit = read_32bitLE;
+    }
+
+    /* 0x04: bank size */
+    version = read_32bit(0x08,streamFile);
+    if (version != 0x03 && version != 0x04)
+        goto fail;
+    total_subsongs = read_32bit(0x0c,streamFile);
+    if (target_subsong == 0) target_subsong = 1;
+    if (target_subsong < 0 || target_subsong > total_subsongs || total_subsongs < 1) goto fail;
+    /* - in v3 */
+    /* 0x10: 0? */
+    /* 0x11: bank name */
+    /* - in v4 */
+    /* 0x10: 1? */
+    /* 0x11: padding flag? */
+    /* 0x12: bank name */
+
+    /* find target WAVE chunk */
+    {
+        int i;
+        off_t offset = read_32bit(0x04, streamFile);
+
+        for (i = 0; i < total_subsongs; i++) {
+            if (i+1 == target_subsong)
+                break;
+            offset += read_32bit(offset+0x04, streamFile); /* WAVE size, variable per codec */
+        }
+        header_offset = offset;
+    }
+
+    /* parse header */
+    if (read_32bitBE(header_offset+0x00, streamFile) != 0x57415645) /* "WAVE" */
+        goto fail;
+    codec        = read_32bit(header_offset+0x08, streamFile);
+    name_offset  = header_offset + 0x0c;
+    start_offset = read_32bit(header_offset+0x2c, streamFile);
+    stream_size    = read_32bit(header_offset+0x30, streamFile);
+    switch(codec) {
+        case 0x03:
+            switch(version) {
+                case 0x03: /* Geometry Wars (PC) */
+                    sample_rate     = read_32bit(header_offset + 0x38, streamFile);
+                    channel_count   = read_32bit(header_offset + 0x40, streamFile);
+                    /* no actual flag, just loop +15sec songs */
+                    loop_flag = (pcm_bytes_to_samples(stream_size, channel_count, 16) > 15*sample_rate);
+                    break;
+
+                case 0x04: /* Project Gotham Racing 4 (X360) */
+                    sample_rate     = read_32bit(header_offset + 0x3c, streamFile);
+                    channel_count   = read_32bit(header_offset + 0x44, streamFile);
+                    loop_flag = read_8bit(header_offset+0x4b, streamFile);
+                    break;
+            }
+            break;
+
+        case 0x07: /* Blur (PS3) */
+            sample_rate     = read_32bit(header_offset+0x40, streamFile);
+            loop_flag        = read_8bit(header_offset+0x48, streamFile);
+            channel_count    = read_8bit(header_offset+0x4b, streamFile);
+            break;
+
+        case 0x08: /* Project Gotham Racing (X360) */
+            sample_rate     = read_32bit(header_offset+0x3c, streamFile);
+            channel_count   = read_32bit(header_offset+0x44, streamFile);
+            loop_flag = read_8bit(header_offset+0x54, streamFile) != 0;
+            break;
+
+        default:
+            VGM_LOG("BAF: unknown version %x\n", version);
+            goto fail;
+    }
+    /* others: pan/vol? fixed values? (0x19, 0x10) */
+
+    /* after WAVEs there may be padding then DATAs chunks, but offsets point after DATA size */
+
+
+    /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+    vgmstream->meta_type = meta_BAF;
+    vgmstream->sample_rate = sample_rate;
+    vgmstream->num_streams = total_subsongs;
+    vgmstream->stream_size = stream_size;
+
+    switch(codec) {
+        case 0x03:
+            vgmstream->coding_type = coding_PCM16LE;
+            vgmstream->layout_type = layout_interleave;
+            vgmstream->interleave_block_size = 0x02;
+
+            vgmstream->num_samples = pcm_bytes_to_samples(stream_size, channel_count, 16);
+            vgmstream->loop_start_sample = 0;
+            vgmstream->loop_end_sample = vgmstream->num_samples;
+            break;
+
+        case 0x07:
+            vgmstream->coding_type = coding_PSX_cfg;
+            vgmstream->layout_type = layout_interleave;
+            vgmstream->interleave_block_size = 0x21;
+
+            vgmstream->num_samples = read_32bit(header_offset+0x44, streamFile);
+            vgmstream->loop_start_sample = 0;
+            vgmstream->loop_end_sample = vgmstream->num_samples;
+            break;
+
+        case 0x08: {
+            uint8_t buf[0x100];
+            int bytes;
+
+            bytes = ffmpeg_make_riff_xma1(buf,0x100, vgmstream->num_samples, stream_size, vgmstream->channels, vgmstream->sample_rate, 0);
+            vgmstream->codec_data = init_ffmpeg_header_offset(streamFile, buf,bytes, start_offset,stream_size);
+            if (!vgmstream->codec_data) goto fail;
+            vgmstream->coding_type = coding_FFmpeg;
+            vgmstream->layout_type = layout_none;
+
+            /* need to manually find sample offsets, it was a thing with XMA1 */
+            {
+                ms_sample_data msd = {0};
+
+                msd.xma_version  = 1;
+                msd.channels     = channel_count;
+                msd.data_offset  = start_offset;
+                msd.data_size    = stream_size;
+                msd.loop_flag    = loop_flag;
+                msd.loop_start_b = read_32bit(header_offset+0x4c, streamFile);
+                msd.loop_end_b   = read_32bit(header_offset+0x50, streamFile);
+                msd.loop_start_subframe  = (read_8bit(header_offset+0x55, streamFile) >> 0) & 0x0f;
+                msd.loop_end_subframe    = (read_8bit(header_offset+0x55, streamFile) >> 4) & 0x0f;
+                xma_get_samples(&msd, streamFile);
+
+                vgmstream->num_samples = msd.num_samples; /* also at 0x58, but unreliable? */
+                vgmstream->loop_start_sample = msd.loop_start_sample;
+                vgmstream->loop_end_sample = msd.loop_end_sample;
+            }
+
+            xma_fix_raw_samples_ch(vgmstream, streamFile, start_offset, stream_size, channel_count, 1,1);
+            break;
+        }
+
+        default:
+            VGM_LOG("BAF: unknown codec %x\n", codec);
+            goto fail;
+    }
+
+    read_string(vgmstream->stream_name,0x20+1, name_offset,streamFile);
+
+
+    if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) )
+        goto fail;
+    return vgmstream;
+
+fail:
+    close_vgmstream(vgmstream);
+    return NULL;
+}
+
+/* awful PS3 splits of the above with bad offsets and all */
+VGMSTREAM * init_vgmstream_baf_badrip(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    off_t WAVE_size, stream_size;
     off_t start_offset;
     long sample_count;
     int sample_rate;
@@ -13,38 +193,31 @@ VGMSTREAM * init_vgmstream_baf(STREAMFILE *streamFile) {
     int channels;
     int loop_flag = 0;
 
-    /* check extensions */
+    /* checks */
     if ( !check_extensions(streamFile, "baf") )
         goto fail;
-
-    /* check WAVE */
     if (read_32bitBE(0,streamFile) != 0x57415645) /* "WAVE" */
         goto fail;
     WAVE_size = read_32bitBE(4,streamFile);
     if (WAVE_size != 0x4c) /* && WAVE_size != 0x50*/
         goto fail;
-    /* check for DATA after WAVE */
     if (read_32bitBE(WAVE_size,streamFile) != 0x44415441) /* "DATA"*/
         goto fail;
     /* check that WAVE size is data size */
-    DATA_size = read_32bitBE(0x30,streamFile);
+    stream_size = read_32bitBE(0x30,streamFile);
-    if (read_32bitBE(WAVE_size+4,streamFile)-8 != DATA_size) goto fail;
+    if (read_32bitBE(WAVE_size+4,streamFile)-8 != stream_size) goto fail;
 
-    /*if (WAVE_size == 0x50) sample_count = DATA_size * frame_samples / frame_size / channels;*/
     sample_count = read_32bitBE(0x44,streamFile);
-
-    /*if (WAVE_size == 0x50) sample_rate = read_32bitBE(0x3c,streamFile);*/
     sample_rate = read_32bitBE(0x40,streamFile);
-
     /* unsure how to detect channel count, so use a hack */
-    channels = (long long)DATA_size / frame_size * frame_samples / sample_count;
+    channels = (long long)stream_size / frame_size * frame_samples / sample_count;
+    start_offset = WAVE_size + 8;
+
 
     /* build the VGMSTREAM */
     vgmstream = allocate_vgmstream(channels,loop_flag);
     if (!vgmstream) goto fail;
 
-    /* fill in the vital statistics */
-    start_offset = WAVE_size + 8;
     vgmstream->sample_rate = sample_rate;
     vgmstream->num_samples = sample_count;
 
@@ -53,14 +226,11 @@ VGMSTREAM * init_vgmstream_baf(STREAMFILE *streamFile) {
     vgmstream->interleave_block_size = frame_size;
     vgmstream->meta_type = meta_BAF;
 
-    /* open the file for reading */
     if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) )
         goto fail;
-
     return vgmstream;
 
 fail:
     close_vgmstream(vgmstream);
     return NULL;
 }
-

src/meta/meta.h

@@ -509,6 +509,7 @@ VGMSTREAM * init_vgmstream_sqex_scd(STREAMFILE* streamFile);
 VGMSTREAM * init_vgmstream_ngc_nst_dsp(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_baf(STREAMFILE* streamFile);
+VGMSTREAM * init_vgmstream_baf_badrip(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_ps3_msf(STREAMFILE* streamFile);
 

src/vgmstream.c

@@ -278,6 +278,7 @@ VGMSTREAM * (*init_vgmstream_functions[])(STREAMFILE *streamFile) = {
     init_vgmstream_sqex_scd,
     init_vgmstream_ngc_nst_dsp,
     init_vgmstream_baf,
+    init_vgmstream_baf_badrip,
     init_vgmstream_ps3_msf,
     init_vgmstream_nub_vag,
     init_vgmstream_ps3_past,