1 files changed, 22 insertions, 62 deletions
diff --git a/gr-fec/lib/ldpc_encoder_impl.cc b/gr-fec/lib/ldpc_encoder_impl.cc
index 95879ea4b7..4905904cf1 100755..100644
--- a/gr-fec/lib/ldpc_encoder_impl.cc
+++ b/gr-fec/lib/ldpc_encoder_impl.cc
@@ -21,102 +21,62 @@
  */
 
 #include "ldpc_encoder_impl.h"
-#include <math.h>
 #include <boost/assign/list_of.hpp>
 #include <volk/volk.h>
 #include <sstream>
 #include <stdio.h>
-#include <vector>
 #include <algorithm>            // for std::reverse
 #include <string.h>             // for memcpy
-#include <gsl/gsl_matrix.h>
 
 namespace gr {
   namespace fec {
 
     generic_encoder::sptr
-    ldpc_encoder::make(std::string alist_file, unsigned int gap)
-    {
-      code::ldpc_H_matrix::sptr H_obj = code::ldpc_H_matrix::make(alist_file, gap);
-      return make_H(H_obj);
-    }
-
-    generic_encoder::sptr
-    ldpc_encoder::make_H(const code::ldpc_H_matrix::sptr H_obj)
+    ldpc_encoder::make(std::string alist_file)
     {
       return generic_encoder::sptr
-        (new ldpc_encoder_impl(H_obj));
+        (new ldpc_encoder_impl(alist_file));
     }
 
-    ldpc_encoder_impl::ldpc_encoder_impl(const code::ldpc_H_matrix::sptr H_obj)
-      : generic_encoder("ldpc_encoder")
+    ldpc_encoder_impl::ldpc_encoder_impl(std::string alist_file)
     {
-      // LDPC parity check matrix to use for encoding
-      d_H = H_obj;
+      if(!boost::filesystem::exists(alist_file)) {
+        throw std::runtime_error("Bad AList file name!");
+      }
 
-      d_rate = static_cast<double>(d_H->n())/static_cast<double>(d_H->k());
+      d_list.read(alist_file.c_str());
+      d_code.set_alist(d_list);
+      inputSize = d_code.dimension();
+      outputSize = d_code.get_N();
 
-      // Set frame size to k, the # of bits in the information word
-      // All buffers and settings will be based on this value.
-      set_frame_size(d_H->k());
-    }
-
-    ldpc_encoder_impl::~ldpc_encoder_impl()
-    {
+      //printf("ENCODER: inputSize = %d, outputSize = %d\n",inputSize, outputSize);
     }
 
     int
     ldpc_encoder_impl::get_output_size()
     {
-      //return outputSize;
-      return d_output_size;
+      return outputSize;
     }
 
     int
     ldpc_encoder_impl::get_input_size()
     {
-      //return inputSize;
-      return d_frame_size;
-    }
-
-    bool
-    ldpc_encoder_impl::set_frame_size(unsigned int frame_size)
-    {
-      bool ret = true;
-
-      if(frame_size % d_H->k() != 0) {
-        GR_LOG_ERROR(d_logger, boost::format("Frame size (%1% bits) must be a "
-                                             "multiple of the information word "
-                                             "size of the LDPC matrix (%2%).") \
-                     % frame_size % (d_H->k()));
-        throw std::runtime_error("ldpc_encoder: cannot use frame size.");
-      }
-
-      d_frame_size = frame_size;
-
-      d_output_size = static_cast<int>(d_rate * d_frame_size);
-
-      return ret;
+      return inputSize;
     }
 
-    double
-    ldpc_encoder_impl::rate()
+    void
+    ldpc_encoder_impl::generic_work(void *inBuffer, void *outBuffer)
     {
-      return d_rate;
+      const unsigned char *in = (const unsigned char *) inBuffer;
+      unsigned char *out = (unsigned char *) outBuffer;
+      std::vector<char> inbuf(inputSize);
+      memcpy(&inbuf[0], in, inputSize);
+      std::vector<char> coded(d_code.encode(inbuf));
+      memcpy(&out[0], &coded[0], coded.size());
     }
 
-    void
-    ldpc_encoder_impl::generic_work(void *inbuffer, void *outbuffer)
+    ldpc_encoder_impl::~ldpc_encoder_impl()
     {
-      // Populate the information word
-      const unsigned char *in = (const unsigned char *)inbuffer;
-      unsigned char *out = (unsigned char*)outbuffer;
-
-      int j = 0;
-      for(int i = 0; i < get_input_size(); i+=d_H->k()) {
-        d_H->encode(&out[j], &in[i]);
-        j += d_H->n();
-      }
     }
 
   }