[MPEG DEMUX] Add some work arounds for stream ids, and comments in PAM on how to get it right when I have more time.

git-svn-id: https://svn.code.sf.net/p/vgmtoolbox/code@748 a691631e-124d-0410-8249-85b9adaa1b1e

Author: snakemeat

format/VGMToolbox/format/SonyPamStream.cs

@@ -10,14 +10,20 @@ public class SonyPamStream : SonyPmfStream
     {
         new public const string DefaultAudioExtension = ".at3";
 
-        new public static readonly byte[] Atrac3Bytes = new byte[] { 0x1E, 0x60, 0x14, 0x00 };
+        new public static readonly byte[] Atrac3Bytes = new byte[] { 0x1E, 0x60, 0x14 };
 
         public const string Ac3AudioExtension = ".ac3";
         public static readonly byte[] Ac3Bytes = new byte[] { 0x1E, 0x60, 0x14, 0x30 };
 
         public const string M2vVideoExtension = ".m2v";
         public static readonly byte[] M2vBytes = new byte[] { 0x00, 0x00, 0x01, 0xB3 };
 
+        /* 
+         For the following values, stream ID is at the offset, from location of ID (000001BD):
+         * 0x8181: 0x11
+         * 0x8180: 0x0E
+         * 0x8100: 0x09                  
+         */
         public SonyPamStream(string path)
             : base(path)
         {
@@ -27,15 +33,14 @@ public SonyPamStream(string path)
 
             base.BlockIdDictionary[BitConverter.ToUInt32(Mpeg2Stream.PacketStartByes, 0)] = new BlockSizeStruct(PacketSizeType.Static, 0xE); // Pack Header
             base.BlockIdDictionary[BitConverter.ToUInt32(new byte[] { 0x00, 0x00, 0x01, 0xBD }, 0)] = new BlockSizeStruct(PacketSizeType.SizeBytes, 2); // Audio Stream, two bytes following equal length (Big Endian)
-            // base.BlockIdDictionary[BitConverter.ToUInt32(new byte[] { 0x00, 0x00, 0x01, 0xBF }, 0)] = new BlockSizeStruct(PacketSizeType.SizeBytes, 2); // Audio Stream, two bytes following equal length (Big Endian)
         }
 
         protected override string GetAudioFileExtension(Stream readStream, long currentOffset)
         {
             string fileExtension;
             byte[] checkBytes;
 
-            checkBytes = ParseFile.ParseSimpleOffset(readStream, (currentOffset + 0xE), 4);
+            checkBytes = ParseFile.ParseSimpleOffset(readStream, (currentOffset + 0xE), 3);
 
             if (ParseFile.CompareSegment(checkBytes, 0, Atrac3Bytes))
             {

format/VGMToolbox/format/SonyPmfStream.cs

@@ -13,7 +13,7 @@ public class SonyPmfStream : Mpeg2Stream
         public const string Atrac3AudioExtension = ".at3";
         public const string LpcmAudioExtension = ".lpcm";
 
-        public static readonly byte[] Atrac3Bytes = new byte[] { 0x1E, 0x60, 0x04, 0x00 };
+        public static readonly byte[] Atrac3Bytes = new byte[] { 0x1E, 0x60, 0x04 };
         public static readonly byte[] LpcmBytes = new byte[] { 0x1E, 0x61, 0x80, 0x40 };
 
         public const string AvcVideoExtension = ".264";
@@ -113,7 +113,7 @@ protected override string GetAudioFileExtension(Stream readStream, long currentO
             string fileExtension;
             byte[] checkBytes;
 
-            checkBytes = ParseFile.ParseSimpleOffset(readStream, (currentOffset + 0xE), 4);
+            checkBytes = ParseFile.ParseSimpleOffset(readStream, (currentOffset + 0xE), 3);
 
             if (ParseFile.CompareSegment(checkBytes, 0, Atrac3Bytes))
             {