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

Merge pull request #911 from NicknineTheEagle/ea

Browse Source 
EAAC: Fixed PCM channel offsets
This commit is contained in:
NicknineTheEagle 2021-08-10 05:55:39 +03:00 committed by GitHub
commit 372cd75076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -2,7 +2,7 @@
#* text=auto #* text=auto
#*.c text=auto #*.c text=auto
#*.h text=auto #*.h text=auto
* -text #* -text
*.sh text eol=lf *.sh text eol=lf
*.bat text eol=crlf *.bat text eol=crlf

2
cli/vgmstream_cli.vcxproj
View File

@ -145,4 +145,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

2
fb2k/foo_input_vgmstream.vcxproj
View File

@ -175,4 +175,4 @@
<UserProperties RESOURCE_FILE="foo_input_vgmstream.rc" /> <UserProperties RESOURCE_FILE="foo_input_vgmstream.rc" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
</Project> </Project>

5
src/layout/blocked_ea_sns.c
View File

@ -42,6 +42,11 @@ void block_update_ea_sns(off_t block_offset, VGMSTREAM* vgmstream) {
return; return;
switch (vgmstream->coding_type) { switch (vgmstream->coding_type) {
case coding_PCM16_int:
channel_start = 0x00;
channel_interleave = 0x02;
break;
case coding_NGC_DSP: case coding_NGC_DSP:
/* 0x04: unknown (0x00/02), 0x08: some size?, 0x34: null? */ /* 0x04: unknown (0x00/02), 0x08: some size?, 0x34: null? */
channel_start = read_32bitBE(block_offset + 0x08 + 0x00, sf); channel_start = read_32bitBE(block_offset + 0x08 + 0x00, sf);

2
src/libvgmstream.vcxproj
View File

@ -711,4 +711,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

6
src/libvgmstream.vcxproj.filters
View File

@ -110,9 +110,6 @@
<ClInclude Include="meta\ea_schl_streamfile.h"> <ClInclude Include="meta\ea_schl_streamfile.h">
<Filter>meta\Header Files</Filter> <Filter>meta\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="meta\encrypted_bgm_streamfile">
<Filter>meta\Header Files</Filter>
</ClInclude>
<ClInclude Include="meta\fsb_encrypted_streamfile.h"> <ClInclude Include="meta\fsb_encrypted_streamfile.h">
<Filter>meta\Header Files</Filter> <Filter>meta\Header Files</Filter>
</ClInclude> </ClInclude>
@ -302,6 +299,9 @@
<ClInclude Include="coding\g7221_decoder_lib.h"> <ClInclude Include="coding\g7221_decoder_lib.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="meta\encrypted_bgm_streamfile.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="formats.c"> <ClCompile Include="formats.c">

2
winamp/in_vgmstream.vcxproj
View File

@ -154,4 +154,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

2
xmplay/xmp-vgmstream.vcxproj
View File

@ -140,4 +140,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>