Changeset 9125 for ossiedev/branches/mcarrick/ossiedev-trunk/system/SigProc/fec_conv.cpp

Timestamp:

03/25/09 20:52:30 (4 years ago)

Author:

mcarrick

Message:

pulling audio device, sig proc, decimator updates from trunk

Files:

• ossiedev/branches/mcarrick/ossiedev-trunk/system/SigProc/fec_conv.cpp (modified) (3 diffs)

ossiedev/branches/mcarrick/ossiedev-trunk/system/SigProc/fec_conv.cpp

@@ -84 +84 @@
 
 
-void trellisTable::GenerateTrellisTable(unsigned int * generatorPolynomials)
-{
+void trellisTable::GenerateTrellisTable(unsigned int * generatorPolynomialsOct)
+{
+    
     numberOfTrellisStates=int(pow(2,(k*(K-1))));
     numberOfInputStates=int(pow(2,k));
@@ -102 +103 @@
     for (unsigned int i = 0; i < numberOfTrellisStates; i++){
         output[i] = new unsigned int[numberOfInputStates];
+    }
+    
+    ///Convert Octal Polynomials to Decimal
+    unsigned int generatorPolynomials[n];
+    for (unsigned short int bitNo=0;bitNo<n;bitNo++){
+        generatorPolynomials[bitNo]=Oct2Dec(generatorPolynomialsOct[bitNo]);
+                
     }
 
@@ -143 +151 @@
     // std::cout<<" Out:"<<tempOut<<" ";
     return tempOut;
+}
+
+///Converts an Octal Number to a Decimal number
+unsigned int trellisTable::Oct2Dec(unsigned int octNumber){
+    unsigned int r,decNumber=0,i;
+
+    for(i=0;octNumber!=0;i++)
+    {
+        r=octNumber%10;
+        decNumber=decNumber+r*(unsigned int)pow(8,i);
+        octNumber=octNumber/10;
+    }
+    
+    return decNumber;
 }