tofdm working with ldpc decoder, Octave side

git-svn-id: https://svn.code.sf.net/p/freetel/code@3476 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/octave/ldpc.m b/codec2-dev/octave/ldpc.m
index 9af0d138f7fadaa7702f4713417caa313187bbf0..908f0f17c49ec5935681fcbe1b9c1077d677d291 100644 (file)
--- a/codec2-dev/octave/ldpc.m
+++ b/codec2-dev/octave/ldpc.m
@@ -84,9 +84,9 @@ function [detected_data errors] = ldpc_dec(code_param, max_iterations, demod_typ
 
     input_somap_c = zeros(1, code_param.code_bits_per_frame );
     bit_likelihood = Somap( symbol_likelihood, demod_type, input_somap_c );
-        
+    
     input_decoder_c = bit_likelihood(1:code_param.code_bits_per_frame);
-        
+
     [x_hat errors] = MpDecode( -input_decoder_c, code_param.H_rows, code_param.H_cols, ...
                               max_iterations, decoder_type, 1, 1);
     detected_data = x_hat(max_iterations,:);

diff --git a/codec2-dev/octave/tofdm.m b/codec2-dev/octave/tofdm.m
index 264e2b7006bdfddf777c72752fd14520cc211444..2bc4a25245dabb62f4eddda6a3e9f877f98e421f 100644 (file)
--- a/codec2-dev/octave/tofdm.m
+++ b/codec2-dev/octave/tofdm.m
@@ -35,9 +35,30 @@ states = ofdm_init(bps, Rs, Tcp, Ns, Nc);
 states.verbose = 0;
 ofdm_load_const;
 
+if cml_support
+  Nuwtxtsymbolsperframe = (states.Nuwbits+states.Ntxtbits)/bps;
+  S_matrix = [1, j, -j, -1];
+  EsNo = 10;
+  symbol_likelihood_log = bit_likelihood_log = detected_data_log = [];
+
+  % Set up LDPC code
+
+  mod_order = 4; bps = 2; modulation = 'QPSK'; mapping = 'gray';
+  demod_type = 0; decoder_type = 0; max_iterations = 100;
+
+  load HRA_112_112.txt
+  [code_param framesize rate] = ldpc_init_user(HRA_112_112, modulation, mod_order, mapping);
+  assert(Nbitsperframe == (code_param.code_bits_per_frame + states.Nuwbits + states.Ntxtbits));
+end
+
 rand('seed',1);
 tx_bits = round(rand(1,Nbitsperframe));
-tx_bits(1:states.Nuwbits) = 0;
+if cml_support
+  ibits = tx_bits(Nuwbits+Ntxtbits+1:Nuwbits+Ntxtbits+code_param.data_bits_per_frame);
+  codeword = LdpcEncode(ibits, code_param.H_rows, code_param.P_matrix);
+  tx_bits(Nuwbits+Ntxtbits+1:end) = codeword;
+end
+tx_bits(1:Nuwbits+Ntxtbits) = 0;
 
 % Run tx loop
 
@@ -77,12 +98,6 @@ if states.timing_en == 0
   states.sample_point = Ncp;
 end
 
-if cml_support
-  Nuwtxtsymbolsperframe = (states.Nuwbits+states.Ntxtbits)/bps;
-  S_matrix = [1, j, -j, -1];
-  EsNo = 10;
-  symbol_likelihood_log = bit_likelihood_log = [];
-end
 
 for f=1:Nframes
 
@@ -122,9 +137,18 @@ for f=1:Nframes
   if cml_support
     symbol_likelihood = Demod2D(arx_np(Nuwtxtsymbolsperframe+1:end), S_matrix, EsNo, arx_amp(Nuwtxtsymbolsperframe+1:end));
     bit_likelihood = Somap(symbol_likelihood);
+
+    [x_hat errors] = MpDecode(-bit_likelihood(1:code_param.code_bits_per_frame), code_param.H_rows, code_param.H_cols, max_iterations, decoder_type, 1, 1);
+    detected_data = x_hat(max_iterations,:);
+
+    % make sure LDPC decoding is working OK
+    
+    assert(codeword == detected_data);
+    
     [m n] = size(symbol_likelihood);
     symbol_likelihood_log = [symbol_likelihood_log; reshape(symbol_likelihood,m*n,1)];
     bit_likelihood_log = [bit_likelihood_log; bit_likelihood'];
+    detected_data_log = [detected_data_log detected_data];
   end
   
 end
@@ -202,4 +226,5 @@ check(foff_hz_log, foff_hz_log_c, 'foff_est_hz');
 check(rx_bits_log, rx_bits_log_c, 'rx_bits');
 check(symbol_likelihood_log, symbol_likelihood_log_c, 'symbol_likelihood_log');
 check(bit_likelihood_log, bit_likelihood_log_c, 'bit_likelihood_log');
+check(detected_data_log, detected_data_log_c, 'detected_data');