Changeset 5535

Timestamp:

10/26/07 17:28:40 (6 years ago)

Author:

jgaeddert

Message:

packing/unpacking ASCII data appropriately; configuring data based upon its metdata content

Location:

experimental/components/CIREN_CE/trunk/CIREN_CE

Files:

• CIREN_CE.cpp (modified) (3 diffs)
• CIREN_CE.h (modified) (1 diff)
• configure.ac (modified) (1 diff)

experimental/components/CIREN_CE/trunk/CIREN_CE/CIREN_CE.cpp

@@ -67 +67 @@
 
 #if 0
-    // delete the threads
+    // delete the threads (compiler throws error)
     delete packet_tx_thread;
     delete packet_rx_thread;
@@ -179 +179 @@
 
     unsigned int i;
-    unsigned int N_in;
-    unsigned int N_out;
+    unsigned int N_in(0);
+    unsigned int N_out(0);
+    unsigned int app_type;
+
+    unsigned int nr;
+    unsigned int nw;
+
+    unsigned int buf_len = 1024;
+    unsigned char * buf1 = new unsigned char[buf_len];
+    unsigned char * buf2 = new unsigned char[buf_len];
 
     while(true) {
+        portAppDataIn->getData(app_data_in, tx_metadata);
+        N_in = app_data_in->length();
+
+        // process data here
+        app_type = tx_metadata->app_id;
+        switch (app_type) {
+        case 1:
+            // audio data: just copy data to output port
+            N_out = N_in;
+            packet_data_out.length(N_out);
+            for (i=0; i<N_in; i++)
+                packet_data_out[i] = (*app_data_in)[i];
+
+            break;
+        case 2:
+            // text data: unpack ASCII to bits and push to output port
+            ///\todo: break up into pieces
+            if (N_in > 64) {
+                std::cerr << "ERROR! CIREN_CE::ProcessPacketTx(): "
+                          << "too many input text characters!" << std::endl;
+                portAppDataIn->bufferEmptied();
+                continue;
+            }
+
+            if (N_in / 8 > buf_len) {
+                std::cerr << "ERROR! CIREN_CE::ProcessPacketTx(): "
+                          << "input ASCII data too large!" << std::endl;
+                throw 0;
+            }
+
+            // copy ASCII data to buf1
+            for (i=0; i<N_in; i++)
+                buf1[i] = (*app_data_in)[i];
+
+            // unpack bytes and store in buf2
+            ///\todo: unpack only 7 bits?
+            SigProc::unpack_bytes(buf1, N_in, buf2, buf_len, &nw);
+            // NOTE: nw (num bits written) should be 8*N_in
+
+            // copy unpacked bits to output buffer
+            N_out = nw;
+            packet_data_out.length(N_out);
+            for (i=0; i<N_out; i++)
+                packet_data_out[i] = buf2[i];
+
+            break;
+        default:
+            std::cout << "WARNING! CIREN_CE::ProcessPacketTx(): "
+                      << "unknown/unsupported application type "
+                      << app_type << std::endl;
+        }
+        
+        // configure metadata properties
+        tx_metadata->packet_type = 1;
+
+        portAppDataIn->bufferEmptied();
+        portPacketDataOut->pushPacket(packet_data_out, *tx_metadata);
+    }
+
+    // delete buffers
+    delete [] buf1;
+    delete [] buf2;
+}
+
+
+void CIREN_CE_i::ProcessPacketRx()
+{
+    DEBUG(3, CIREN_CE, "ProcessPacketRx() invoked");
+
+    unsigned int i;
+    unsigned int N_in(0);
+    unsigned int N_out(0);
+
+    unsigned int app_type;
+
+    unsigned int nr;
+    unsigned int nw;
+
+    unsigned int buf_len = 1024;
+    unsigned char * buf1 = new unsigned char[buf_len];
+    unsigned char * buf2 = new unsigned char[buf_len];
+
+    while(true) {
+        portPacketDataIn->getData(packet_data_in, rx_metadata);
+        N_in = packet_data_in->length();
+        //standardInterfaces::PrintMetaData(*tx_metadata);
+
+        // process data here
+        app_type = rx_metadata->app_id;
+        switch (app_type) {
+        case 1:
+            // audio data: just copy data to output port
+            ///\todo: set eom flag appropriately
+            N_out = N_in;
+            app_data_out.length(N_out);
+            for (i=0; i<N_in; i++)
+                app_data_out[i] = (*packet_data_in)[i];
+
+            break;
+        case 2:
+            // text data: pack ASCII from bits and push to output port
+            ///\todo: combine pieces into block
+
+            // copy bits to buf1
+            for (i=0; i<N_in; i++)
+                buf1[i] = (*packet_data_in)[i];
+
+            // pack bytes and store in buf2
+            ///\todo: pack only 7 bits?
+            SigProc::pack_bytes(buf1, N_in, buf2, buf_len, &nw);
+            // NOTE: nw (num bits written) should be N_in/8
+
+            // copy packed ASCII bytes to output buffer
+            N_out = nw;
+            app_data_out.length(N_out);
+            for (i=0; i<N_out; i++)
+                app_data_out[i] = buf2[i];
+
+            break;
+        default:
+            std::cout << "WARNING! CIREN_CE::ProcessPacketRx(): "
+                      << "unknown/unsupported application type "
+                      << app_type << std::endl;
+            portPacketDataIn->bufferEmptied();
+            continue;
+        }
+       
+        portPacketDataIn->bufferEmptied();
+        DEBUG(7, CIREN_CE::RX, "pushing " << N_out << " samples")
+        portAppDataOut->pushPacket(app_data_out, *rx_metadata);
+    }
+
+    // delete buffers
+    delete [] buf1;
+    delete [] buf2;
+}
+
+
+void CIREN_CE_i::ProcessControl()
+{
+    DEBUG(3, CIREN_CE, "ProcessControl() invoked");
+
+    //unsigned int i;
+    //unsigned int N_in;
+    //unsigned int N_out;
+
+    while(true) {
+        /*
         portAppDataIn->getData(app_data_in, tx_metadata);
         N_in = app_data_in->length();
@@ -197 +353 @@
         tx_metadata->packet_type = 1;
 
-        portAppDataIn->bufferEmptied();
-        portPacketDataOut->pushPacket(packet_data_out, *tx_metadata);
-    }
-}
-
-
-void CIREN_CE_i::ProcessPacketRx()
-{
-    DEBUG(3, CIREN_CE, "ProcessPacketRx() invoked");
-
-    unsigned int i;
-    unsigned int N_in;
-    unsigned int N_out;
-
-    while(true) {
-        portPacketDataIn->getData(packet_data_in, rx_metadata);
-        N_in = packet_data_in->length();
-
-        // process data here
-        
-        // just copy data to output port
-        N_out = N_in;
-        app_data_out.length(N_out);
-        for (i=0; i<N_in; i++)
-            app_data_out[i] = (*packet_data_in)[i];
-
-        // configure metadata properties
-        //rx_metadata->packet_type = 1;
-
-        portPacketDataIn->bufferEmptied();
-        portAppDataOut->pushPacket(app_data_out, *rx_metadata);
-    }
-}
-
-
-void CIREN_CE_i::ProcessControl()
-{
-    DEBUG(3, CIREN_CE, "ProcessControl() invoked");
-
-    //unsigned int i;
-    //unsigned int N_in;
-    //unsigned int N_out;
-
-    while(true) {
-        /*
-        portAppDataIn->getData(app_data_in, tx_metadata);
-        N_in = app_data_in->length();
-
-        // process data here
-        
-        // just copy data to output port
-        N_out = N_in;
-        packet_data_out.length(N_out);
-        for (i=0; i<N_in; i++)
-            packet_data_out[i] = (*app_data_in)[i];
-
-        // configure metadata properties
-        tx_metadata->packet_type = 1;
-
         portPacketDataOut->pushPacket(packet_data_out, *tx_metadata);
         */

experimental/components/CIREN_CE/trunk/CIREN_CE/CIREN_CE.h

@@ -30 +30 @@
 #include "ossie/Resource_impl.h"
 #include "ossie/debug.h"
-
+#include "sigproc/SigProc.h"
 
 #include "standardinterfaces/Radio_Control_u.h"

experimental/components/CIREN_CE/trunk/CIREN_CE/configure.ac

@@ -19 +19 @@
 AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])])
 
+AC_CHECK_LIB([sigproc], [main], [], [AC_MSG_ERROR([cannot find sigproc library])])
+AC_CHECK_HEADERS([sigproc/SigProc.h], [], [AC_MSG_ERROR([cannot find sigproc library header files])])
+
 AC_CHECK_LIB([standardInterfaces], [main], [], [AC_MSG_ERROR([cannot find standardInterfaces])])
 AC_CHECK_HEADERS([standardinterfaces/complexShort.h], [], [AC_MSG_ERROR([cannot find standardInterfaces header files])])