Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-01-30 11:57:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted .h and stream opener

Browse Source
This commit is contained in:
bnnm 2017-01-02 17:05:01 +01:00
parent aaf137817c
commit 5b70e3688b
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/header.c
View File

@ -1,6 +1,8 @@
#include <string.h> #include <string.h>
#include "header.h"
#include "vgmstream.h" #include "vgmstream.h"
#include "streamfile.h" #include "streamfile.h"
#include "streamtypes.h"
#include "util.h" #include "util.h"
/** /**
@ -43,17 +45,6 @@ int header_open_stream(VGMSTREAM * vgmstream, STREAMFILE *streamFile, off_t star
streamFile->get_name(streamFile,filename,sizeof(filename)); streamFile->get_name(streamFile,filename,sizeof(filename));
#if 0
/* there is no appreciable difference using this */
if (vgmstream->layout_type == layout_mpeg) {
for (ch=0; ch < vgmstream->channels; ch++) {
vgmstream->ch[ch].streamfile = streamFile->open(streamFile,filename,MPEG_BUFFER_SIZE);
vgmstream->ch[ch].channel_start_offset= vgmstream->ch[ch].offset=start_offset;
}
}
else
#endif
{ {
file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE); file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
if (!file) return 0; if (!file) return 0;
@ -61,9 +52,9 @@ int header_open_stream(VGMSTREAM * vgmstream, STREAMFILE *streamFile, off_t star
for (ch=0; ch < vgmstream->channels; ch++) { for (ch=0; ch < vgmstream->channels; ch++) {
vgmstream->ch[ch].streamfile = file; vgmstream->ch[ch].streamfile = file;
if (vgmstream->coding_type == coding_MS_IMA if (vgmstream->layout_type == layout_none
|| vgmstream->coding_type == coding_XBOX) { /*todo not needed?*/ || vgmstream->layout_type == layout_mpeg) { /* no appreciable difference for mpeg */
/* both IMA channels work with same bytes */ /* for some codecs like IMA where channels work with the same bytes */
vgmstream->ch[ch].channel_start_offset = vgmstream->ch[ch].channel_start_offset =
vgmstream->ch[ch].offset = start_offset; vgmstream->ch[ch].offset = start_offset;
} }
@ -72,7 +63,6 @@ int header_open_stream(VGMSTREAM * vgmstream, STREAMFILE *streamFile, off_t star
vgmstream->ch[ch].offset = start_offset vgmstream->ch[ch].offset = start_offset
+ vgmstream->interleave_block_size*ch; + vgmstream->interleave_block_size*ch;
} }
/*todo if interleave and ch > 0 and layout none don't change offset? */
} }
} }

2
src/header.h
View File

@ -10,7 +10,7 @@
#include "vgmstream.h" #include "vgmstream.h"
int header_check_extensions(STREAMFILE *streamFile, char * extensions); int header_check_extensions(STREAMFILE *streamFile, const char * cmpexts);
int header_open_stream(VGMSTREAM * vgmstream, STREAMFILE *streamFile, off_t start_offset); int header_open_stream(VGMSTREAM * vgmstream, STREAMFILE *streamFile, off_t start_offset);