Merge branch 'master' of https://github.com/morkt/GARbro

Author: crskycode

ArcFormats/Ankh/ArcGRP.cs

@@ -118,6 +118,12 @@ internal void DetectFileTypes (ArcView file, List<Entry> dir)
                     entry.UnpackedSize = header.ToUInt32 (0);
                     entry.IsPacked = true;
                 }
+                else if (header.AsciiEqual (0, "zfd "))
+                {
+                    entry.ChangeType (ImageFormat.Tga);
+                    entry.UnpackedSize = header.ToUInt32 (4);
+                    entry.IsPacked = true;
+                }
                 else if (header.AsciiEqual (4, "OggS"))
                 {
                     entry.ChangeType (OggAudio.Instance);
@@ -177,6 +183,8 @@ public override Stream OpenEntry (ArcFile arc, Entry entry)
                         return OpenTpw (arc, pent);
                     if (arc.File.View.AsciiEqual (entry.Offset+4, "HDJ\0"))
                         return OpenImage (arc, pent);
+                    if (arc.File.View.AsciiEqual (entry.Offset, "zfd "))
+                        return OpenZfd (arc, pent);
                     if (entry.Size > 12)
                     {
                         byte type = arc.File.View.ReadByte (entry.Offset+4);
@@ -243,6 +251,12 @@ Stream OpenTpw (ArcFile arc, PackedEntry entry)
             }
         }
 
+        Stream OpenZfd (ArcFile arc, PackedEntry entry)
+        {
+            var input = arc.File.CreateStream (entry.Offset+8, entry.Size-8);
+            return new ZLibStream (input, CompressionMode.Decompress);
+        }
+
         internal static void UnpackTpw (IBinaryStream input, byte[] output)
         {
             input.Position = 8;

ArcFormats/ArcFormats.csproj

@@ -123,6 +123,8 @@
     <Compile Include="AdvSys\ImageGWD.cs" />
     <Compile Include="Ail\ArcLNK2.cs" />
     <Compile Include="AIRNovel\ArcAIR.cs" />
+    <Compile Include="CsWare\AudioWAV.cs" />
+    <Compile Include="CsWare\ImageGDT.cs" />
     <Compile Include="FC01\ArcBDT.cs" />
     <Compile Include="FC01\BdtTables.cs" />
     <Compile Include="GScripter\ArcDATA.cs" />
@@ -170,9 +172,13 @@
     <Compile Include="NScripter\Script.cs" />
     <Compile Include="Psp\ArcQPK.cs" />
     <Compile Include="ScrPlayer\ImageIMG.cs" />
+    <Compile Include="SingleFileArchive.cs" />
+    <Compile Include="Software House Parsley\ArcCG3.cs" />
     <Compile Include="Software House Parsley\ArcScn.cs" />
     <Compile Include="TechGian\ArcBIN.cs" />
     <Compile Include="Unity\ScriptDSM.cs" />
+    <Compile Include="Xuse\ArcNT.cs" />
+    <Compile Include="Xuse\ArcWVB.cs" />
     <Compile Include="Zyx\ImageXMG.cs" />
     <Compile Include="AudioAIFF.cs" />
     <Compile Include="Basil\ArcMIF.cs" />
@@ -751,7 +757,6 @@
     <Compile Include="AZSys\ArcAZSys.cs" />
     <Compile Include="Ethornell\ArcBGI.cs" />
     <Compile Include="Ffa\ArcBlackPackage.cs" />
-    <None Include="Macromedia\ArcCCT.cs" />
     <Compile Include="Cherry\ArcCherry.cs" />
     <Compile Include="Circus\ArcCircus.cs" />
     <Compile Include="ArcCommon.cs" />

ArcFormats/CsWare/AudioWAV.cs

@@ -0,0 +1,92 @@
+//! \file       AudioWAV.cs
+//! \date       2023 Oct 26
+//! \brief      Obscure C's ware WAVE file encoding.
+//
+// Copyright (C) 2023 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using GameRes.Utility;
+using System;
+using System.ComponentModel.Composition;
+using System.IO;
+
+// [960405][C's Ware] GLO-RI-A ~Kindan no Ketsuzoku~
+
+namespace GameRes.Formats.CsWare
+{
+    [Export(typeof(AudioFormat))]
+    [ExportMetadata("Priority", 1)] // should be tried before generic WAVE format
+    public class WavAudio : AudioFormat
+    {
+        public override string         Tag => "WAV/CSWARE";
+        public override string Description => "C's ware encoded audio";
+        public override uint     Signature => 0x46464952; // 'RIFF'
+        public override bool      CanWrite => false;
+
+        public override SoundInput TryOpen (IBinaryStream file)
+        {
+            var header = file.ReadHeader (0x2E);
+            if (header[0x14] != 1 || header[0x15] != 0xFF
+                || !header.AsciiEqual (8, "WAVEfmt ")
+                || !header.AsciiEqual (0x26, "data"))
+                return null;
+            var format = new WaveFormat {
+                FormatTag = 1,
+                Channels = header.ToUInt16 (0x16),
+                SamplesPerSecond = header.ToUInt32 (0x18),
+                AverageBytesPerSecond = header.ToUInt32 (0x1C) * 2,
+                BlockAlign = (ushort)(header.ToUInt16 (0x20) * 2),
+                BitsPerSample = 16,
+            };
+            uint input_size = header.ToUInt32 (0x2A);
+            var samples = new byte[input_size * 2];
+            Decode (file, samples);
+            var decoded = new BinMemoryStream (samples, file.Name);
+            file.Dispose();
+            return new RawPcmInput (decoded, format);
+        }
+
+        void Decode (IBinaryStream input, byte[] output)
+        {
+            int dst = 0;
+            while (input.PeekByte() != -1)
+            {
+                sbyte sample = input.ReadInt8();
+                LittleEndian.Pack (SampleMap[sample + 128], output, dst);
+                dst += 2;
+            }
+        }
+
+        static readonly short[] SampleMap = InitSampleMap();
+
+        static short[] InitSampleMap ()
+        {
+            var map = new short[256];
+            for (int i = 1; i <= 127; ++i)
+            {
+                map[128 + i] = (short)(Math.Pow (10.0, ((double)i + 44.8637) / 38.0597) - 14.5342);
+                map[128 - i] = (short)-map[i + 128];
+            }
+            map[0] = -0x8000;
+            return map;
+        }
+    }
+}