Changeset 6059ec7 in ammosreader

Timestamp:

06/28/22 19:22:31 (3 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource, guix

Children:

b41e975

Parents:

72b50cd

Message:

accessors added - AmmosAudioDataBlock added

Files:

• ammosreader/AmmosAudioDataBlock.py (added)
• ammosreader/AmmosAudioReader.py (modified) (3 diffs)
• ammosreader/AmmosContainer.py (modified) (1 diff)
• ammosreader/AmmosGlobalFrameBody.py (modified) (2 diffs)
• ammosreader/AmmosSingleFrame.py (modified) (1 diff)
• sample_scripts/audio_reader.py (modified) (2 diffs)

ammosreader/AmmosAudioReader.py

@@ -9 +9 @@
 from ammosreader.AmmosSingleFrame import AmmosSingleFrame
 from ammosreader.AmmosContainer import AmmosContainer
+from ammosreader.AmmosAudioDataBlock import AmmosAudioDataBlock
 
 
@@ -146 +147 @@
             return None
         # print([hex(c) for c in byte_string])
-        return byte_string
+        return AmmosAudioDataBlock(byte_string, channel_count, sample_count, sample_size)
 
     def read_next_global_frame_body(self, global_frame_header):
@@ -199 +200 @@
         ammos_single_frame = AmmosSingleFrame(global_frame_header, global_frame_body)
         return ammos_single_frame
+
+    def pcm_for_channel(self, a_channel):
+        return b"".join([each.global_frame_body.data_body.pcm_for_channel(a_channel) for each in self.container.global_frames])

ammosreader/AmmosContainer.py

@@ -4 +4 @@
 
     def __init__(self, name, frames):
-        self.name = name
-        self.global_frames = frames
-        self.tags = []
+        self.__name = name
+        self.__global_frames = frames
+        self.__tags = []
+
+    @property
+    def name(self):
+        return self.__name
+
+    @name.setter
+    def name(self, a_name):
+        self.__name = a_name
+
+    @property
+    def global_frames(self):
+        return self.__global_frames
 
     def add_tag(self, tag):
-        self.tags.append(tag)
+        self.__tags.append(tag)
 
     def add_frame(self, frame):
-        self.global_frames.append(frame)
+        self.__global_frames.append(frame)
 
     def size(self):
-        return sum([each.global_frame_header.frame_length for each in self.global_frames])
+        return sum([each.global_frame_header.frame_length for each in self.__global_frames])
 
     def frequencies(self):
-        return set(list(filter(lambda frame: frame.global_frame_body.data_header.frequency, self.global_frames)))
+        return set(list(filter(lambda frame: frame.global_frame_body.data_header.frequency, self.__global_frames)))
 
     def __str__(self):
-        start_time = self.global_frames[0].global_frame_body.data_header.timestamp
-        end_time = self.global_frames[-1].global_frame_body.data_header.timestamp
+        start_time = self.__global_frames[0].global_frame_body.data_header.timestamp
+        end_time = self.__global_frames[-1].global_frame_body.data_header.timestamp
 
-        frq = str(self.global_frames[0].global_frame_body.data_header.frequency)
+        frq = str(self.__global_frames[0].global_frame_body.data_header.frequency)
 
         return ("Start time: " + str(start_time) +
                 "\nEnd time  : " + str(end_time) + "\nFrequencies: " + frq)
+
+    def data_only(self):
+        return [each.global_frame_body.data_body.data for each in self.__global_frames]

ammosreader/AmmosGlobalFrameBody.py

@@ -2 +2 @@
 
     def __init__(self, data_header, data_body):
-        self.data_header = data_header
-        self.data_body = data_body
+        self.__data_header = data_header
+        self.__data_body = data_body
+
+    @property
+    def data_header(self):
+        return self.__data_header
+
+    @data_header.setter
+    def data_header(self, a_data_header):
+        self.__data_header = a_data_header
+
+    @property
+    def data_body(self):
+        return self.__data_body
+
+    @data_body.setter
+    def data_body(self, data_bytes):
+        self.__data_body = data_bytes
 
     def data_bytes_only(self):
@@ -13 +29 @@
                 print("Block is nil")
 
-            byte_string += each_block.if_data
+            byte_string += each_block.data
 
         return byte_string

ammosreader/AmmosSingleFrame.py

@@ -2 +2 @@
 
     def __init__(self, global_frame_header, global_frame_body):
-        self.global_frame_header = global_frame_header
-        self.global_frame_body = global_frame_body
+        self.__global_frame_header = global_frame_header
+        self.__global_frame_body = global_frame_body
+
+    @property
+    def global_frame_header(self):
+        return self.__global_frame_header
+
+    @property
+    def global_frame_body(self):
+        return self.__global_frame_body
 
     def data(self):

sample_scripts/audio_reader.py

@@ -1 +1 @@
 import sys
 import os
+import io
+from pydub import AudioSegment
+from pydub.playback import play
+
 sys.path.append('../src/')
 
@@ -17 +21 @@
 
     dat_file.read_all_frames_left()
-    print(dat_file.container.size())
+    print("Sample rate:", dat_file.container.global_frames[0].global_frame_body.data_header.sample_rate)
+    print("Container size:", dat_file.container.size())
+    pcm_data = dat_file.pcm_for_channel(0)
+    print("PCM data size total:", len(pcm_data))
+    data = AudioSegment.from_raw(io.BytesIO(pcm_data),
+                                 sample_width=2,
+                                 frame_rate=22050,
+                                 channels=1)
+    play(data)