New bit depth audio data property

Zeugma440 · Dec 1, 2022 · 4bdece1 · 4bdece1
1 parent 18b5127
commit 4bdece1
Show file tree

Hide file tree

Showing 35 changed files with 173 additions and 152 deletions.
diff --git a/ATL.test/IO/AudioData/AudioData.cs b/ATL.test/IO/AudioData/AudioData.cs
diff --git a/ATL.test/IO/HighLevel.cs b/ATL.test/IO/HighLevel.cs
@@ -958,6 +958,7 @@ public void StreamedIO_R_Audio()
 
                 Assert.AreEqual(33, theTrack.Duration);
                 Assert.AreEqual(69, theTrack.Bitrate);
+                Assert.AreEqual(-1, theTrack.BitDepth);
                 Assert.AreEqual(22050, theTrack.SampleRate);
                 Assert.AreEqual(true, theTrack.IsVBR);
                 Assert.AreEqual(23125, theTrack.TechnicalInformation.AudioDataOffset);

diff --git a/ATL/AudioData/AudioFileIO.cs b/ATL/AudioData/AudioFileIO.cs
@@ -236,6 +236,11 @@ public double BitRate
             get => audioData.BitRate;
         }
         /// <inheritdoc/>
+        public int BitDepth
+        {
+            get => audioData.BitDepth;
+        }
+        /// <inheritdoc/>
         public int SampleRate
         {
             get => audioData.SampleRate;

diff --git a/ATL/AudioData/IO/AA.cs b/ATL/AudioData/IO/AA.cs
@@ -146,6 +146,9 @@ public int SampleRate
                 }
             }
         }
+
+        public int BitDepth => -1; // Irrelevant for lossy formats
+
         public string FileName
         {
             get { return fileName; }

diff --git a/ATL/AudioData/IO/AAC.cs b/ATL/AudioData/IO/AAC.cs
@@ -92,6 +92,9 @@ public int SampleRate
         {
             get { return sampleRate; }
         }
+
+        public int BitDepth => -1; // Irrelevant for lossy formats
+
         public string FileName
         {
             get { return fileName; }

diff --git a/ATL/AudioData/IO/AC3.cs b/ATL/AudioData/IO/AC3.cs
@@ -53,6 +53,9 @@ public int SampleRate
         {
             get { return (int)this.sampleRate; }
         }
+
+        public int BitDepth => -1; // Irrelevant for lossy formats
+
         public ChannelsArrangement ChannelsArrangement
         {
             get { return channelsArrangement; }

diff --git a/ATL/AudioData/IO/AIFF.cs b/ATL/AudioData/IO/AIFF.cs
@@ -64,7 +64,7 @@ private struct ChunkHeader
         }
 
         // Private declarations 
-        private uint bits;
+        private int bits;
 
         private string compression;
         private byte versionID;
@@ -94,10 +94,6 @@ public byte VersionID // Version code
         {
             get { return this.versionID; }
         }
-        public uint Bits
-        {
-            get { return bits; }
-        }
         public double CompressionRatio
         {
             get { return getCompressionRatio(); }
@@ -132,6 +128,9 @@ public double BitRate
         {
             get { return bitrate; }
         }
+
+        public int BitDepth => (bits > 0) ? bits : -1;
+
         public double Duration
         {
             get { return duration; }
@@ -352,7 +351,7 @@ protected override bool read(BinaryReader source, MetaDataIO.ReadTagParams readT
                             }
 
                             uint numSampleFrames = StreamUtils.DecodeBEUInt32(source.ReadBytes(4));
-                            short sampleSize = StreamUtils.DecodeBEInt16(source.ReadBytes(2)); // This sample size is for uncompressed data only
+                            bits = StreamUtils.DecodeBEInt16(source.ReadBytes(2)); // This sample size is for uncompressed data only
                             byte[] byteArray = source.ReadBytes(10);
                             Array.Reverse(byteArray);
                             double aSampleRate = StreamUtils.ExtendedToDouble(byteArray);
@@ -373,12 +372,12 @@ protected override bool read(BinaryReader source, MetaDataIO.ReadTagParams readT
 
                                 if (!compression.Equals(COMPRESSION_NONE)) // Sample size is specific to selected compression method
                                 {
-                                    if (compression.ToLower().Equals("fl32")) sampleSize = 32;
-                                    else if (compression.ToLower().Equals("fl64")) sampleSize = 64;
-                                    else if (compression.ToLower().Equals("alaw")) sampleSize = 8;
-                                    else if (compression.ToLower().Equals("ulaw")) sampleSize = 8;
+                                    if (compression.ToLower().Equals("fl32")) bits = 32;
+                                    else if (compression.ToLower().Equals("fl64")) bits = 64;
+                                    else if (compression.ToLower().Equals("alaw")) bits = 8;
+                                    else if (compression.ToLower().Equals("ulaw")) bits = 8;
                                 }
-                                if (duration > 0) bitrate = sampleSize * numSampleFrames * channelsArrangement.NbChannels / duration;
+                                if (duration > 0) bitrate = bits * numSampleFrames * channelsArrangement.NbChannels / duration;
                             }
                         }
                         else if (header.ID.Equals(CHUNKTYPE_SOUND))

diff --git a/ATL/AudioData/IO/Ape.cs b/ATL/AudioData/IO/Ape.cs
@@ -118,10 +118,6 @@ public ChannelsArrangement ChannelsArrangement
         {
             get { return channelsArrangement; }
         }
-        public int Bits
-        {
-            get { return bits; }
-        }
         public uint PeakLevel
         {
             get { return peakLevel; }
@@ -190,6 +186,9 @@ public double Duration
         {
             get { return duration; }
         }
+
+        public int BitDepth => bits;
+
         public bool IsMetaSupported(MetaDataIOFactory.TagType metaDataType)
         {
             return (metaDataType == MetaDataIOFactory.TagType.APE) || (metaDataType == MetaDataIOFactory.TagType.ID3V1) || (metaDataType == MetaDataIOFactory.TagType.ID3V2);

diff --git a/ATL/AudioData/IO/CAF.cs b/ATL/AudioData/IO/CAF.cs
@@ -129,6 +129,7 @@ class CAF : MetaDataIO, IAudioDataIO
         private double bitrate;
         private double duration;
         private uint channelsPerFrame;
+        private uint bitsPerChannel;
         double secondsPerByte;
         private ChannelsArrangement channelsArrangement;
 
@@ -163,6 +164,9 @@ public double BitRate
         {
             get { return bitrate; }
         }
+
+        public int BitDepth => (int)(bitsPerChannel * channelsPerFrame);
+
         public double Duration
         {
             get { return duration; }
@@ -217,6 +221,7 @@ protected void resetData()
             bitrate = 0;
             isVbr = false;
             codecFamily = 0;
+            bitsPerChannel = 0;
             channelsPerFrame = 0;
             channelsArrangement = null;
             secondsPerByte = 0;
@@ -256,7 +261,7 @@ private void readAudioDescriptionChunk(BinaryReader source)
             uint bytesPerPacket = StreamUtils.DecodeBEUInt32(source.ReadBytes(4));
             uint framesPerPacket = StreamUtils.DecodeBEUInt32(source.ReadBytes(4));
             channelsPerFrame = StreamUtils.DecodeBEUInt32(source.ReadBytes(4));
-            source.BaseStream.Seek(4, SeekOrigin.Current); // bits per channel
+            bitsPerChannel = StreamUtils.DecodeBEUInt32(source.ReadBytes(4));
 
             sampleRate = (uint)Math.Round(m_sampleRate);
 

diff --git a/ATL/AudioData/IO/DSF.cs b/ATL/AudioData/IO/DSF.cs
@@ -35,10 +35,6 @@ class DSF : IAudioDataIO, IMetaDataEmbedder
 
 
         // Public declarations 
-        public uint Bits
-        {
-            get { return bits; }
-        }
         public double CompressionRatio
         {
             get { return getCompressionRatio(); }
@@ -71,6 +67,9 @@ public double BitRate
         {
             get { return bitrate; }
         }
+
+        public int BitDepth => (int)bits;
+
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/DTS.cs b/ATL/AudioData/IO/DTS.cs
@@ -30,10 +30,6 @@ class DTS : IAudioDataIO
 
 
         // Public declarations
-        public uint Bits
-        {
-            get { return bits; }
-        }
         public double CompressionRatio
         {
             get { return getCompressionRatio(); }
@@ -66,6 +62,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => (int)bits;
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/DummyReader.cs b/ATL/AudioData/IO/DummyReader.cs
@@ -38,6 +38,10 @@ public int SampleRate
         {
             get { return 0; }
         }
+
+        /// <inheritdoc/>
+        public int BitDepth => -1;
+
         /// <inheritdoc/>
         public bool IsVBR
         {

diff --git a/ATL/AudioData/IO/FLAC.cs b/ATL/AudioData/IO/FLAC.cs
@@ -93,6 +93,7 @@ public double BitRate
         {
             get { return Math.Round(((double)(sizeInfo.FileSize - AudioDataOffset)) * 8 / Duration); }
         }
+        public int BitDepth => bitsPerSample;
         public double Duration
         {
             get { return getDuration(); }

diff --git a/ATL/AudioData/IO/GYM.cs b/ATL/AudioData/IO/GYM.cs
@@ -72,6 +72,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/IT.cs b/ATL/AudioData/IO/IT.cs
@@ -73,6 +73,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/MIDI.cs b/ATL/AudioData/IO/MIDI.cs
@@ -324,6 +324,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         /// <inheritdoc/>
         public double Duration
         {

diff --git a/ATL/AudioData/IO/MOD.cs b/ATL/AudioData/IO/MOD.cs
@@ -136,6 +136,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/MP4.cs b/ATL/AudioData/IO/MP4.cs
@@ -161,6 +161,7 @@ public double BitRate
         {
             get { return bitrate / 1000.0; }
         }
+        public int BitDepth => -1; // Irrelevant for lossy formats
         public double Duration
         {
             get { return getDuration(); }

diff --git a/ATL/AudioData/IO/MPEGaudio.cs b/ATL/AudioData/IO/MPEGaudio.cs
@@ -234,6 +234,7 @@ public void LoadFromByteArray(byte[] data)
         public VBRData VBR { get => vbrData; }
         public bool IsVBR { get => vbrData.Found; }
         public double BitRate { get => getBitRate(); }
+        public int BitDepth => -1; // Irrelevant for lossy formats
         public double Duration { get => getDuration(); }
         public ChannelsArrangement ChannelsArrangement { get => getChannelsArrangement(HeaderFrame); }
         public int SampleRate { get => getSampleRate(); }

diff --git a/ATL/AudioData/IO/MPEGplus.cs b/ATL/AudioData/IO/MPEGplus.cs
@@ -60,6 +60,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for lossy formats
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/Ogg.cs b/ATL/AudioData/IO/Ogg.cs
@@ -71,6 +71,7 @@ class Ogg : VorbisTagHolder, IMetaDataIO, IAudioDataIO
 
         private int contents;
 
+        private int bits;
         private int sampleRate;
         private ushort bitRateNominal;
         private ulong samples;
@@ -100,6 +101,7 @@ public double BitRate
         {
             get { return getBitRate(); }
         }
+        public int BitDepth => bits; // Only for embedded FLAC
         public double Duration
         {
             get { return getDuration(); }
@@ -312,6 +314,7 @@ protected void resetData()
         {
             sampleRate = 0;
             bitRateNominal = 0;
+            bits = -1;
             samples = 0;
             contents = -1;
             AudioDataOffset = -1;
@@ -750,6 +753,7 @@ public bool Read(BinaryReader source, ReadTagParams readTagParams)
                 {
                     channelsArrangement = info.FlacParameters.getChannelsArrangement();
                     sampleRate = info.FlacParameters.SampleRate;
+                    bits = info.FlacParameters.BitsPerSample;
                     // No nominal bitrate for FLAC
                 }
 

diff --git a/ATL/AudioData/IO/OptimFROG.cs b/ATL/AudioData/IO/OptimFROG.cs
@@ -89,6 +89,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => getBits();
         public double Duration
         {
             get { return duration; }
@@ -153,6 +154,11 @@ private double getBitrate()
             return ((sizeInfo.FileSize - header.Size - sizeInfo.TotalTagSize) * 8 / Duration);
         }
 
+        private sbyte getBits()
+        {
+            return OFR_BITS[header.SampleType];
+        }
+
         public bool Read(BinaryReader source, SizeInfo sizeInfo, MetaDataIO.ReadTagParams readTagParams)
         {
             bool result = false;

diff --git a/ATL/AudioData/IO/PSF.cs b/ATL/AudioData/IO/PSF.cs
@@ -104,6 +104,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/S3M.cs b/ATL/AudioData/IO/S3M.cs
@@ -80,6 +80,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/SPC.cs b/ATL/AudioData/IO/SPC.cs
@@ -166,6 +166,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => -1; // Irrelevant for that format
         public double Duration
         {
             get { return duration; }

diff --git a/ATL/AudioData/IO/TAK.cs b/ATL/AudioData/IO/TAK.cs
@@ -35,10 +35,6 @@ class TAK : IAudioDataIO
 
 
         // Public declarations 
-        public uint Bits
-        {
-            get { return bits; }
-        }
         public double CompressionRatio
         {
             get { return getCompressionRatio(); }
@@ -71,6 +67,7 @@ public double BitRate
         {
             get { return bitrate; }
         }
+        public int BitDepth => (bits > 0) ? (int)bits : -1;
         public double Duration
         {
             get { return duration; }
@@ -165,8 +162,9 @@ public bool Read(BinaryReader source, SizeInfo sizeInfo, MetaDataIO.ReadTagParam
 
                         sampleCount = (readData16 >> 14) + (readData32 << 2) + ((restOfData & 0x00000080) << 34);
 
-                        sampleRate = ((restOfData >> 4) & 0x03ffff) + 6000; // bits 4 to 21
-                        channelsArrangement = ChannelsArrangements.GuessFromChannelNumber((int)((restOfData >> 27) & 0x0F) + 1); // bits 28 to 31
+                        sampleRate = ((restOfData >> 4) & 0x03ffff) + 6000; // bits 5 to 22
+                        bits = ((restOfData >> 22) & 0x1f) + 8; // bits 23 to 27
+                        channelsArrangement = GuessFromChannelNumber((int)((restOfData >> 27) & 0x0f) + 1); // bits 28 to 31
 
                         if (sampleCount > 0)
                         {