Changeset 4182

Timestamp:

06/14/07 21:31:28 (6 years ago)

Author:

hvolos

Message:

Now it *should not* crash

Location:

experimental/components/Conv_Enc

Files:

• Conv_Enc.cpp (modified) (16 diffs)
• Conv_Enc.prf.xml (modified) (1 diff)

experimental/components/Conv_Enc/Conv_Enc.cpp

@@ -36 +36 @@
     inputGeneratorPolynomials[0]=0;
     inputGeneratorPolynomials[1]=0;
-    encoder=new SigProc::fec_conv_encoder;
+    encoder=new SigProc::fec_conv_encoder();
     configured=false;
     //Create the thread for the writer's processing function 
@@ -52 +52 @@
     delete []inputGeneratorPolynomials;
     delete trellisTables;
+    delete encoder;
 }
 
@@ -190 +191 @@
                 (short unsigned int)K);
 
-                DEBUG(3, Conv_Dec, "custom trellis table generated")
+                DEBUG(3, Conv_Enc, "custom trellis table generated")
                 break;
             case 1:
                 //Rate 1, no trellis needed;           
-            
+                DEBUG(3, Conv_Enc, "Pass through mode")
                 break;
             case 2:
@@ -207 +208 @@
                 (short unsigned int)5,
                 (short unsigned int)2);
-                DEBUG(3, Conv_Dec, "4/5 trellis table generated")
+                DEBUG(3, Conv_Enc, "4/5 trellis table generated")
                 break;
             case 3:
@@ -218 +219 @@
                 (short unsigned int)3,
                 (short unsigned int)4);
-                DEBUG(3, Conv_Dec, "2/3 trellis table generated")
+                DEBUG(3, Conv_Enc, "2/3 trellis table generated")
                 break;
             case 4:
@@ -228 +229 @@
                 (short unsigned int)2,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/2 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/2 trellis table generated")
                 break;
             case 5:
@@ -239 +240 @@
                 (short unsigned int)3,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/3 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/3 trellis table generated")
                 break;
             case 6:   
@@ -251 +252 @@
                 (short unsigned int)4,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/4 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/4 trellis table generated")
                 break;
             case 7:
@@ -265 +266 @@
                 (short unsigned int)5,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/5 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/5 trellis table generated")
                 break;
             case 8:
@@ -280 +281 @@
                 (short unsigned int)6,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/6 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/6 trellis table generated")
                 break;
             case 9:
@@ -296 +297 @@
                 (short unsigned int)7,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/7 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/7 trellis table generated")
                 break;
             case 10:
@@ -312 +313 @@
                 (short unsigned int)8,
                 (short unsigned int)7);
-                DEBUG(3, Conv_Dec, "1/8 trellis table generated")
+                DEBUG(3, Conv_Enc, "1/8 trellis table generated")
                 break;
             default:
@@ -321 +322 @@
             encoder->SetTrellisTable(trellisTables);
 
-             DEBUG(4, Conv_Dec, "the trellis was sent to the encoder")
+             DEBUG(4, Conv_Enc, "the trellis was sent to the encoder")
             }
             configured=true;
@@ -340 +341 @@
     unsigned short int numberOfBits;
     SigProc::trellisTable *theTrellisTable;
-    theTrellisTable=trellisTables;
+
 
 
     while(1)
     { 
-        
+                
         dataIn_0->getData(I_in_0);
+            
         
         if (!configured) throw 0;
@@ -359 +361 @@
                 I_out_0[i]=(*I_in_0)[i];
             };
-            DEBUG(4, Conv_Enc, "Pass through mode, no encoding done")
+            DEBUG(4, Conv_Enc, "Pass through mode, no encoding will done")
         }else {
 
-        DEBUG(4, Conv_Enc, numberOfBits<<" bits received")
-        noOfSymbols=numberOfBits/theTrellisTable->k;
-        I_out_0.length(noOfSymbols*theTrellisTable->n);
-        DEBUG(6, Conv_Enc, " Output length set to:"<<noOfSymbols*theTrellisTable->n)
-        encoder->ResetState();
-        DEBUG(6, Conv_Enc, " Encoder state was reset")
-        /*insert code here to do work*/
-        for (unsigned int i=0;i<noOfSymbols;i++){
-            for (unsigned int j=0;j<theTrellisTable->k;j++){
-                data2Enc[j]=(*I_in_0)[i*theTrellisTable->k +j];
-            }
+            DEBUG(4, Conv_Enc, numberOfBits<<" bits received")
+            theTrellisTable=trellisTables;            
+            noOfSymbols=numberOfBits/theTrellisTable->k;
+            I_out_0.length(noOfSymbols*theTrellisTable->n);
+            DEBUG(6, Conv_Enc, " Output length set to:"<<noOfSymbols*theTrellisTable->n)
+            encoder->ResetState();
+            DEBUG(6, Conv_Enc, " Encoder state was reset")
+            /*insert code here to do work*/
+            for (unsigned int i=0;i<noOfSymbols;i++){
+                 for (unsigned int j=0;j<theTrellisTable->k;j++){
+                    data2Enc[j]=(*I_in_0)[i*theTrellisTable->k +j];
+                 }
             DEBUG(11, Conv_Enc, i+1<<" symbol to be encoded")
-        encoder->Encode(data2Enc,encData);
+            
+            encoder->Encode(data2Enc,encData);
         
             for (int j=0;j<theTrellisTable->n;j++){
@@ -380 +384 @@
                  I_out_0[i*theTrellisTable->n+j]=tmp;
              }
-        DEBUG(11, Conv_Enc, i+1<<" symbol encoded")
-        }
-
-        }
-
-
+            DEBUG(11, Conv_Enc, i+1<<" symbol encoded")
+            }
+
+        }
+
+        DEBUG(6, Conv_Enc, "Trying to push packet")
         dataOut_0->pushPacket(I_out_0);
+        
+        DEBUG(6, Conv_Enc, "Now trying to empty the buffer")
         dataIn_0->bufferEmptied();
-       DEBUG(4, Conv_Enc, noOfSymbols*theTrellisTable->n<<" Bits sent to the next component")
+        
+        DEBUG(6, Conv_Enc, "buffer emptied")                
+                
+        if (rate_index!=1){
+        DEBUG(4, Conv_Enc, noOfSymbols*theTrellisTable->n<<" Bits sent to the next component")
+                
+        } else {
+        DEBUG(4, Conv_Enc, numberOfBits<<" Bits sent to the next component")        
+        }
     }
 }

experimental/components/Conv_Enc/Conv_Enc.prf.xml

@@ -5 +5 @@
 <properties>
     <simple type="short" id="DCE:345df262-1611-11dc-a219-0016769e497b" name="rate_index" mode="readwrite">
-        <description>The index of the desired encoding rate from the supported rates table. For a custom rate use rate_index=0</description> 
-        <value>1</value> 
+        <description>The index of the desired encoding rate from the supported rates table. For a custom rate use rate_index 0</description> 
+        <value>2</value> 
         <kind kindtype="configure"/>
     </simple>