Merge pull request #4 from soneek/master

Added experimental support for bfwav

fb2k/in_vgmstream.cpp

@@ -297,6 +297,7 @@ bool input_vgmstream::g_is_our_path(const char * p_path,const char * p_extension
 	if(!stricmp_utf8(p_extension,"bar")) return 1;
 	if(!stricmp_utf8(p_extension,"bcstm")) return 1;
 	if(!stricmp_utf8(p_extension,"bcwav")) return 1;
+	if(!stricmp_utf8(p_extension,"bfwav")) return 1;
 	if(!stricmp_utf8(p_extension,"bg00")) return 1;
 	if(!stricmp_utf8(p_extension,"bgw")) return 1;
 	if(!stricmp_utf8(p_extension,"bh2pcm")) return 1;
@@ -621,6 +622,7 @@ DECLARE_MULTIPLE_FILE_TYPE("BAF Audio File (*.BAF)", baf);
 DECLARE_MULTIPLE_FILE_TYPE("BAR Audio File (*.BAR)", bar);
 DECLARE_MULTIPLE_FILE_TYPE("BCSTM Audio File (*.BCSTM)", bcstm);
 DECLARE_MULTIPLE_FILE_TYPE("BCWAV Audio File (*.BCWAV)", bcwav);
+DECLARE_MULTIPLE_FILE_TYPE("BFWAV Audio File (*.BFWAV)", bfwav);
 DECLARE_MULTIPLE_FILE_TYPE("BG00 Audio File (*.BG00)", bg00);
 DECLARE_MULTIPLE_FILE_TYPE("BGW Audio File (*.BGW)", bgw);
 DECLARE_MULTIPLE_FILE_TYPE("BH2PCM Audio File (*.BH2PCM)", bh2pcm);

src/Makefile

@@ -292,7 +292,8 @@ META_OBJS=meta/adx_header.o \
     meta/ubi_ckd.o \
     meta/ps2_vbk.o \
     meta/otm.o \
-    meta/bcstm.o
+    meta/bcstm.o \
+	meta/bfwav.o
 
 OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)
 

src/meta/bfwav.c

@@ -0,0 +1,169 @@
+#include "meta.h"
+#include "../util.h"
+
+VGMSTREAM * init_vgmstream_bfwav(STREAMFILE *streamFile) {
+	VGMSTREAM * vgmstream = NULL;
+	char filename[260];
+
+	coding_t coding_type;
+
+	int big_endian = 1;
+	int ima = 0;
+	int32_t(*read_32bit)(off_t, STREAMFILE*) = NULL;
+	int16_t(*read_16bit)(off_t, STREAMFILE*) = NULL;
+	read_16bit = read_16bitBE;
+	read_32bit = read_32bitBE;
+
+	off_t head_offset;
+	off_t seek_offset;
+	int codec_number;
+	int channel_count;
+	int loop_flag;
+
+	off_t start_offset;
+
+	/* check extension, case insensitive */
+	streamFile->get_name(streamFile, filename, sizeof(filename));
+	if (strcasecmp("bfwav", filename_extension(filename)))
+		goto fail;
+
+	/* check header */
+	if ((uint32_t)read_32bitBE(0, streamFile) != 0x46574156) /* "FWAV" */
+		goto fail;
+
+	if ((uint32_t)read_32bitBE(4, streamFile) != 0xFEFF0040) /* "FWAV" */
+		goto fail;
+
+	/* get head offset, check */
+	if (big_endian)
+		head_offset = read_32bit(0x18, streamFile);
+
+	
+	if ((uint32_t)read_32bitBE(head_offset, streamFile) != 0x494E464F)  /* "INFO" (FWAV)*/
+		goto fail;
+	
+
+	/* check type details */
+	codec_number = read_8bit(head_offset + 0x8, streamFile);
+	loop_flag = read_8bit(head_offset + 0x9, streamFile);
+	channel_count = read_8bit(head_offset + 0x1F, streamFile);
+
+	switch (codec_number) {
+	case 0:
+		coding_type = coding_PCM8;
+		break;
+	case 1:
+		if (big_endian)
+			coding_type = coding_PCM16BE;
+		else
+			coding_type = coding_PCM16LE;
+		break;
+	case 2:
+		coding_type = coding_NGC_DSP;
+		break;
+	default:
+		goto fail;
+	}
+
+	if (channel_count < 1) goto fail;
+
+	/* build the VGMSTREAM */
+
+	vgmstream = allocate_vgmstream(channel_count, loop_flag);
+	if (!vgmstream) goto fail;
+
+	/* fill in the vital statistics */
+	vgmstream->num_samples = read_32bit(head_offset + 0x14, streamFile);
+	vgmstream->sample_rate = (uint16_t)read_16bit(head_offset + 0xE, streamFile);
+	/* channels and loop flag are set by allocate_vgmstream */
+
+	vgmstream->loop_start_sample = read_32bit(head_offset + 0x10, streamFile);
+	vgmstream->loop_end_sample = vgmstream->num_samples;
+
+	vgmstream->coding_type = coding_type;
+	if (channel_count == 1)
+		vgmstream->layout_type = layout_none;
+	else
+	{
+		if (ima)
+			vgmstream->layout_type = layout_interleave;
+		else
+			vgmstream->layout_type = layout_interleave_shortblock;
+	}
+	if (big_endian)
+		vgmstream->meta_type = meta_FWAV;
+
+	if (big_endian)
+	{
+	//	vgmstream->interleave_block_size = read_32bit(head_offset + 0x38, streamFile);
+	//	vgmstream->interleave_smallblock_size = read_32bit(head_offset + 0x48, streamFile);
+
+		vgmstream->interleave_block_size = 0x200;
+		vgmstream->interleave_smallblock_size = 0x20;
+	}
+
+	if (big_endian)
+		start_offset = read_32bitBE(0x24, streamFile) + 0x20;
+
+	if (vgmstream->coding_type == coding_NGC_DSP) {
+		off_t coef_offset;
+		off_t coef_offset1;
+		off_t coef_offset2;
+		int coef_spacing;
+		int i, j;
+	
+		coef_spacing = 0x2E;
+
+		off_t coeffheader = head_offset + 0x28;
+		int foundcoef = 0;
+		while (!(foundcoef))
+		{
+			if ((uint32_t)read_32bit(coeffheader, streamFile) == 0x1F000000)
+			{
+				coef_offset = read_32bit(coeffheader + 0xC, streamFile) + coeffheader;
+				foundcoef = 1;
+				break;				
+			}
+			coeffheader++;
+		}
+			
+		
+
+		for (j = 0; j<vgmstream->channels; j++) {
+			for (i = 0; i<16; i++) {
+				vgmstream->ch[j].adpcm_coef[i] = read_16bit(coef_offset + j*coef_spacing + i * 2, streamFile);
+			}
+		}
+	}
+
+
+
+	/* open the file for reading by each channel */
+	{
+		int i;
+		for (i = 0; i<channel_count; i++) {
+			if (vgmstream->layout_type == layout_interleave_shortblock)
+				vgmstream->ch[i].streamfile = streamFile->open(streamFile, filename,
+				vgmstream->interleave_block_size);
+			else if (vgmstream->layout_type == layout_interleave)
+				vgmstream->ch[i].streamfile = streamFile->open(streamFile, filename,
+				STREAMFILE_DEFAULT_BUFFER_SIZE);
+			else
+				vgmstream->ch[i].streamfile = streamFile->open(streamFile, filename,
+				0x1000);
+
+			if (!vgmstream->ch[i].streamfile) goto fail;
+
+			vgmstream->ch[i].channel_start_offset =
+				vgmstream->ch[i].offset =
+				start_offset + i*vgmstream->interleave_block_size;
+		}
+	}
+
+	return vgmstream;
+
+	/* clean up anything we may have opened */
+fail:
+	if (vgmstream) close_vgmstream(vgmstream);
+	return NULL;
+}

src/meta/meta.h

@@ -632,4 +632,6 @@ VGMSTREAM * init_vgmstream_otm(STREAMFILE* streamFile);
 
 VGMSTREAM * init_vgmstream_bcstm(STREAMFILE* streamFile);
 
+VGMSTREAM * init_vgmstream_bfwav(STREAMFILE* streamFile);
+
 #endif

src/vgmstream.c

@@ -17,6 +17,7 @@
 VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
     init_vgmstream_adx,
     init_vgmstream_brstm,
+	init_vgmstream_bfwav,
     init_vgmstream_nds_strm,
     init_vgmstream_agsc,
     init_vgmstream_ngc_adpdtk,

src/vgmstream.h

@@ -240,7 +240,8 @@ typedef enum {
     meta_RWSD,              /* single-stream RWSD */
     meta_RWAR,              /* single-stream RWAR */
     meta_RWAV,              /* contents of RWAR */
-    meta_CWAV,              /* */
+    meta_CWAV,              /* contents of CWAR */
+	meta_FWAV				/* contents of FWAR */
     meta_RSTM_SPM,          /* RSTM with 44->22khz hack */
     meta_THP,
     meta_RSTM_shrunken,     /* Atlus' mutant shortened RSTM */

unix/data.c

@@ -44,6 +44,7 @@ gchar *vgmstream_exts [] = {
   "bar",
   "bcstm",
   "bcwav",
+  "bfwav",
   "bg00",
   "bgw",
   "bh2pcm",

winamp/in_vgmstream.c

@@ -109,6 +109,7 @@ char * extension_list[] = {
 	"bcstm\0BCSTM Audio File (*.BCSTM)\0",
     "bcwav\0BCWAV (*.BCWAV)\0",
     "bdsp\0BDSP Audio File (*.BDSP)\0",
+	"bfwav\0BFWAV Audio File (*.BFWAV)\0",
     "bg00\0BG00 Audio File (*.BG00)\0",
     "bgw\0BGW Audio File (*.BGW)\0",
     "bh2pcm\0BH2PCM Audio File (*.BH2PCM)\0",