Changeset 5511

Timestamp:

10/25/07 13:12:50 (6 years ago)

Author:

jgaeddert

Message:

packing samples properly in output realChar port so that C++ components can read them properly, sending COPY of metadata to output port so that packet_id is not changed before packet is sent, adding global audio variables, adding global method to create default meta data object

Location:

experimental/components/rc2007_gui

Files:

• WorkModules.py (modified) (10 diffs)
• port_impl.py (modified) (2 diffs)

experimental/components/rc2007_gui/WorkModules.py

@@ -36 +36 @@
 import ossaudiodev
 import struct   # for audio
+import copy
 
 import cvsd     # this is in my rc2007_gui package directory
@@ -69 +70 @@
     return math.sqrt(e/len(x))
 
+# global sound card variables
+audio_sampling_frequency = 16000
+audio_channels = 1
+audio_buffer_length = 1024
+
+def CreateMetadataObject():
+    modulation_scheme = SI.ModulationScheme(SI.ModulationScheme.PSK, 2)
+
+    packet_id = 0
+    sampling_frequency = 0.0
+    carrier_frequency = 0.0
+    signal_bandwidth = 0.0
+    signal_strength = 0.0
+    eom = True
+    default_metadata = SI.MetaData(modulation_scheme,
+                                   packet_id,
+                                   sampling_frequency,
+                                   carrier_frequency,
+                                   signal_bandwidth,
+                                   signal_strength,
+                                   eom) 
+    return default_metadata
+
 
 class txWorkClass:
@@ -80 +104 @@
     
         # open the capture device and set properties
-        Fs = 16000   # sampling frequency
-        self.num_channels = 2
+        Fs = audio_sampling_frequency   # sampling frequency
+        self.num_channels = audio_channels
 
         # open the playback device and set properties
@@ -90 +114 @@
 
 
-        self.buf_len = 512*2*self.num_channels
+        self.buf_len = audio_buffer_length
 
         self.voice_data_queue = []
@@ -97 +121 @@
         self.is_running = True 
 
-        modulation_scheme = SI.ModulationScheme(SI.ModulationScheme.PSK, 2)
-
-        packet_id = 0
-        sampling_frequency = 0.0
-        carrier_frequency = 0.0
-        signal_bandwidth = 0.0
-        signal_strength = 0.0
-        eom = True
-        self.default_metadata = SI.MetaData(modulation_scheme,
-                                            packet_id,
-                                            sampling_frequency,
-                                            carrier_frequency,
-                                            signal_bandwidth,
-                                            signal_strength,
-                                            eom) 
-   
+        # create meta data objects for audio and text
+        self.audio_metadata = CreateMetadataObject()
+        self.text_metadata = CreateMetadataObject()
+
         self.my_encoder = cvsd.encoder()
         self.my_decoder = cvsd.decoder()
@@ -150 +162 @@
     def SendTextData(self,text):
         # TODO: pack/depack
-        metadata = self.default_metadata
         # tmp: False for text
         # configure meta data here
-        metadata.eom = False
-        self.rc2007_gui_ref.to_radio_port_servant.send_data(text, metadata)
+        self.text_metadata.eom = False
+        self.text_metadata.packet_id += 1
+        #print "text " + str(self.text_metadata.packet_id) + "  " + text
+        self.rc2007_gui_ref.to_radio_port_servant.send_data(
+                text,
+                copy.copy(self.text_metadata))
     
     def Release(self):
@@ -161 +176 @@
         
     def Process(self):
-        metadata = self.default_metadata
         while self.is_running:
             self.voice_data_signal.wait()  # wait for data to be aded to the 
@@ -175 +189 @@
                     # encode audio data using CVSD codec
                     data_int = self.my_encoder.Encode(data)
-                    # convert integer data (0,1) to string
+                    # pack integers into string
+                    # NOTE: this does NOT mean that an integer zero is
+                    #   converted into an ASCII '0' character, but rather
+                    #   the '\x00' character
                     data = ''
                     for b in data_int:
-                        data += str(b)
-
+                        data += struct.pack('B', b);
+                    # tmp: true for voice
+                    # configure meta data here
+                    self.audio_metadata.eom = True
+                    self.audio_metadata.packet_id += 1
+
+                    #print ">"*4 + " audio enc " + str(self.audio_metadata.packet_id) + \
+                    #      "  " + str(data_int[0:10])
         
                     if self.rc2007_gui_ref.to_radio_port_active:
-                        # tmp: true for voice
-                        # configure meta data here
-                        metadata.eom = True
-                        self.rc2007_gui_ref.to_radio_port_servant.send_data(data, metadata)
+                        #print "audio length: " + str(len(data))
+                        self.rc2007_gui_ref.to_radio_port_servant.send_data(
+                                data,
+                                copy.copy(self.audio_metadata))
 
             self.voice_data_signal.clear()  # done reading the buffer
@@ -201 +224 @@
    
         # new method: 
-        self.num_channels = 2
-        Fs = 16000
+        self.num_channels = audio_channels
+        Fs = audio_sampling_frequency
         self.speaker_driver = ossaudiodev.open('w')
         self.speaker_driver.setfmt(ossaudiodev.AFMT_S16_LE)
@@ -319 +342 @@
                     data_int = []
                     for c in data:
-                        data_int.append(int(c))
+                        data_int.append( int(struct.unpack('B', c)[0]) )
+                    #print "<"*4 + " audio dec " + str(metadata.packet_id) + \
+                    #      "  " + str(data_int[0:10])
+
                     self.CVSDDecode(data_int)
 

experimental/components/rc2007_gui/port_impl.py

@@ -43 +43 @@
 
     def pushPacketMetaData(self, data, metadata):
+        #print "rx packet " + str(metadata.packet_id) + \
+        #      ", len = " + str(len(data)) + \
+        #      "  voice? " + str(metadata.eom)
         self.parent.rx_work_mod.AddMetaData(data, metadata)
 
@@ -101 +104 @@
                 # send the data to all outPort connections 
                 for port in self.outPorts.values():
+                    #print "tx packet " + str(metadata.packet_id) + \
+                    #      ", len = " + str(len(data)) + \
+                    #      "  voice? " + str(metadata.eom)
                     port.pushPacketMetaData(data, metadata)