Changeset 008dcb7 in ammosreader

Timestamp:

05/28/23 09:21:31 (2 years ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

AmmosSource

Children:

0c6fd4c

Parents:

d2736bb

Message:

new branch to generalize input source

Location:

ammosreader

Files:

• AbstractAmmosReader.py (modified) (5 diffs)
• AmmosAudioFileReader.py (added)
• AmmosAudioReader.py (modified) (4 diffs)
• AmmosAudioSocketReader.py (modified) (1 diff)
• AmmosContainer.py (modified) (1 diff)
• AmmosFileSource.py (added)
• AmmosSocketSource.py (added)
• AmmosSource.py (added)

ammosreader/AbstractAmmosReader.py

@@ -13 +13 @@
     """I implement a base class for specialized AmmosReaders."""
 
-    def __init__(self, file_name):
+    def __init__(self, source):
         """
         I am the standard constructor for Ammos Readers.
@@ -19 +19 @@
         Additional information about the file can be added as key/value pairs in tags
 
-        :param file_name: The file to read Ammos data from
-        :type file_name: str
+        :param source: The source to read Ammos data from
+        :type source: AmmosSource 
         """
-        self.__file_name = file_name
-        self.__ammos_file = open(self.file_name, "rb")
-        self.__container = AmmosContainer(self.file_name, [])
+        self.__source = source
+        self.__container = AmmosContainer(self.__source.name, [])
         self.__tags = {}
 
     @property
-    def file_name(self):
-        """I return the name of the original file."""
-        return self.__file_name
-
-    @property
-    def ammos_file(self):
-        """I return the file to read the data from."""
-        return self.__ammos_file
+    def source(self):
+        """I return the source of this reader."""
+        return self.__source
 
     @property
@@ -51 +45 @@
         assert a_key not in self.__tags
         self.__tags[a_key] = a_value
-
-    def rewind_to_start(self):
-        """I set the file pointer to the beginning of the file for the next operation."""
-        self.ammos_file.seek(0)
 
     def read_all_frames_left(self):
@@ -85 +75 @@
         header_size = AmmosGlobalFrameHeader.HEADER_SIZE
 
-        in_bytes = self.ammos_file.read(header_size)
+        in_bytes = self.__source.read_bytes(header_size)
         logger.info("Reading next global frame header")
         if ((not in_bytes) or (len(in_bytes) < header_size)):
@@ -99 +89 @@
         return current_global_frame_header
 
+    def read_bytes(self, bytes_to_read):
+        """My descendents have to implement this."""
+        return self.__source.read_bytes(bytes_to_read)
+    
     @abstractmethod
     def read_next_global_frame_body(self, data_header_length):

ammosreader/AmmosAudioReader.py

@@ -23 +23 @@
         header_size = AmmosAudioDataHeader.HEADER_SIZE
 
-        in_bytes = self.ammos_file.read(header_size)
+        in_bytes = self.source.read_bytes(header_size)
 
         logger.info("\nReading global frame body standard data header\n")
@@ -40 +40 @@
         header_size = AmmosExtendedAudioDataHeader.HEADER_SIZE
 
-        in_bytes = self.ammos_file.read(header_size)
+        in_bytes = self.source.read_bytes(header_size)
 
         if ((not in_bytes) or (len(in_bytes) < header_size)):
@@ -65 +65 @@
         total = number_of_samples*number_of_channels*sample_size
 
-        byte_string = self.ammos_file.read(total)
+        byte_string = self.source.read_bytes(total)
 
         if len(byte_string) != total:
@@ -113 +113 @@
         :rtype: bytes
         """
-        return (b"".join([each.global_frame_body.data_body.pcm_for_channel(a_channel)
-                          for each in self.container.global_frames]))
+        return self.__container.pcm_for_channel(a_channel)

ammosreader/AmmosAudioSocketReader.py

@@ -103 +103 @@
                 ammos_global_header_buffer.append(self.__get_next_data(20))
                 # while len(b''.join(ammos_global_header_buffer)) < 24:
-                #    ammos_global_header_buffer.append(self.__socket.recv(24 - len(b''.join(ammos_global_header_buffer))))
+                #  ammos_global_header_buffer.append(self.__socket.recv(24 - len(b''.join(ammos_global_header_buffer))))
 
                 ammos_global_header = AmmosGlobalFrameHeader.from_bytes(b''.join(ammos_global_header_buffer))

ammosreader/AmmosContainer.py

@@ -56 +56 @@
                 "\nEnd time  : " + str(end_time) + "\nFrequencies: " + frq)
 
-    def data_only(self):
+    def payload(self):
         return [each.global_frame_body.data_body.data for each in self.__global_frames]
+
+    def pcm_for_channel(self, a_channel):
+        """
+        I return the raw pcm audio data for a given channel.
+
+        :param a_channel: the channel I have to extract
+        :type a_channel: int
+
+        :rtype: bytes
+        """
+        return (b"".join([each.global_frame_body.data_body.pcm_for_channel(a_channel)
+                          for each in self.global_frames]))