TAG724 2024/03/02 2nd

Core:XGM2:PCMの再生サンプリングレートを13.3kHzに調整。(MDSoundによるもの) 13.3kHzの.wavファイルを読み込めるようにした。スクリプトにSOXによる13.3kHz変換を追加。
kuma4649 · Mar 2, 2024 · cb08787 · cb08787
1 parent 43bd8f3
commit cb08787
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/mml2vgm/CHANGE.txt b/mml2vgm/CHANGE.txt
@@ -1,4 +1,9 @@
 �X�V����
+TAG724 2024/03/02 2nd
+  Core:XGM2:PCM�̍Đ��T���v�����O���[�g��13.3kHz�ɒ����B(MDSound�ɂ�����)
+            13.3kHz��.wav�t�@�C����ǂݍ��߂�悤�ɂ����B
+            �X�N���v�g��SOX�ɂ��13.3kHz�ϊ���ǉ��B
+
 TAG723 2024/03/02
   Core:XGM2:Export,MDPlayer�ɂ�鉉�t���ɂ�PCM������}������悤�ɏC��(�b��)
             FM,DCSG�ŉ��t���Ԃ��قȂ�ꍇ�͒Z���ق���Wait��ǉ����Ē������鏈���ǉ�

diff --git a/mml2vgm/Core/Common.cs b/mml2vgm/Core/Common.cs
@@ -118,7 +118,7 @@ public static byte[] GetPCMDataFromFile(string path, string fileName, int vol, o
                         }
 
                         samplerate = buf[p + 4] + buf[p + 5] * 0x100 + buf[p + 6] * 0x10000 + buf[p + 7] * 0x1000000;
-                        if (samplerate != 8000 && samplerate != 16000 && samplerate != 18500 && samplerate != 14000)
+                        if (samplerate != 8000 && samplerate != 16000 && samplerate != 18500 && samplerate != 14000 && samplerate != 13300)
                         {
                             msgBox.setWrnMsg(string.Format(msg.get("E02006"), samplerate), new LinePos(null,"-"));
                             //return null;

diff --git a/mml2vgm/Core/MDSound.dll b/mml2vgm/Core/MDSound.dll
diff --git a/mml2vgm/mml2vgmIDEx64/Script/SOX/sox.py b/mml2vgm/mml2vgmIDEx64/Script/SOX/sox.py
@@ -13,9 +13,11 @@ def title(self):
         return (
         r"Information(log view)"
         + r"|Convert pcm(8bit,unsigned,8KHz,mono)"
+        + r"|Convert pcm(8bit,unsigned,13.3KHz,mono)"
         + r"|Convert pcm(8bit,unsigned,14KHz,mono)"
         + r"|Convert pcm(8bit,unsigned,16KHz,mono)"
         + r"|Convert pcm(8bit,unsigned,18.5KHz,mono)"
+        + r"|Convert pcm(16bit,signed,13.3KHz,mono)"
         + r"|Convert pcm(16bit,signed,14KHz,mono)"
         + r"|Convert pcm(16bit,signed,16KHz,mono)"
         + r"|Convert pcm(16bit,signed,18.5KHz,mono)"
@@ -39,6 +41,8 @@ def scriptType(self):
         + r"|FromTreeViewContextMenu"
         + r"|FromTreeViewContextMenu"
         + r"|FromTreeViewContextMenu"
+        + r"|FromTreeViewContextMenu"
+        + r"|FromTreeViewContextMenu"
         )
 
     #このスクリプトがサポートするファイル拡張子を|をデリミタとして列挙する。
@@ -55,6 +59,8 @@ def supportFileExt(self):
         + r"|.wav"
         + r"|.wav"
         + r"|.wav"
+        + r"|.wav"
+        + r"|.wav"
         )
 
     #ショートカットキーを定義します。
@@ -93,10 +99,12 @@ def run(self, Mml2vgmInfo, index):
 
             argList = [
                 "--i \"{0}{1}\""
-                , "\"{0}{1}\" -r 8000  -b 8 -c 1 \"{0}_8k{1}\""
-                , "\"{0}{1}\" -r 14000 -b 8 -c 1 \"{0}_14k{1}\""
-                , "\"{0}{1}\" -r 16000 -b 8 -c 1 \"{0}_16k{1}\""
-                , "\"{0}{1}\" -r 18500 -b 8 -c 1 \"{0}_18500{1}\""
+                , "\"{0}{1}\" -r 8000  -b 8 -c 1 \"{0}_8b_8k{1}\""
+                , "\"{0}{1}\" -r 13300 -b 8 -c 1 \"{0}_8b_13300{1}\""
+                , "\"{0}{1}\" -r 14000 -b 8 -c 1 \"{0}_8b_14k{1}\""
+                , "\"{0}{1}\" -r 16000 -b 8 -c 1 \"{0}_8b_16k{1}\""
+                , "\"{0}{1}\" -r 18500 -b 8 -c 1 \"{0}_8b_18500{1}\""
+                , "\"{0}{1}\" -b 16 -r 13300 -e signed-integer -c 1 \"{0}_16b_13300{1}\""
                 , "\"{0}{1}\" -b 16 -r 14000 -e signed-integer -c 1 \"{0}_16b_14k{1}\""
                 , "\"{0}{1}\" -b 16 -r 16000 -e signed-integer -c 1 \"{0}_16b_16k{1}\""
                 , "\"{0}{1}\" -b 16 -r 18500 -e signed-integer -c 1 \"{0}_16b_18500{1}\""