Moving blocks to libs. GpsL1CaPcpsAcquisition now accepts cshorts and

cbytes

src/algorithms/libs/CMakeLists.txt

@@ -16,30 +16,28 @@
 # along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
 #
 
+
+set(GNSS_SPLIBS_SOURCES
+    galileo_e1_signal_processing.cc
+    gnss_sdr_valve.cc
+    gnss_signal_processing.cc
+    gps_sdr_signal_processing.cc
+    nco_lib.cc
+    pass_through.cc
+    galileo_e5_signal_processing.cc
+    complex_byte_to_float_x2.cc
+    byte_x2_to_complex_byte.cc
+    cshort_to_float_x2.cc
+    short_x2_to_cshort.cc
+    complex_float_to_complex_byte.cc
+)
+    
+    
 if(OPENCL_FOUND)
-    set(GNSS_SPLIBS_SOURCES
-         galileo_e1_signal_processing.cc
-         gnss_sdr_valve.cc
-         gnss_signal_processing.cc
-         gps_sdr_signal_processing.cc
-         nco_lib.cc
-         fix_fft.cc
-         pass_through.cc
+    set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
          fft_execute.cc # Needs OpenCL
          fft_setup.cc # Needs OpenCL
          fft_kernelstring.cc # Needs OpenCL
-         galileo_e5_signal_processing.cc
-    )
-else(OPENCL_FOUND)
-    set(GNSS_SPLIBS_SOURCES
-         galileo_e1_signal_processing.cc
-         gnss_sdr_valve.cc
-         gnss_signal_processing.cc
-         gps_sdr_signal_processing.cc
-         nco_lib.cc
-         fix_fft.cc
-         pass_through.cc
-         galileo_e5_signal_processing.cc
     )
 endif(OPENCL_FOUND)
 
@@ -52,7 +50,9 @@ include_directories(
      ${GLOG_INCLUDE_DIRS}
      ${GFlags_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+     ${GNURADIO_BLOCKS_INCLUDE_DIRS}
      ${VOLK_INCLUDE_DIRS}
+     ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
 if(OPENCL_FOUND)
@@ -68,10 +68,16 @@ file(GLOB GNSS_SPLIBS_HEADERS "*.h")
 add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
-target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES} 
+target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES}
+                                   ${VOLK_LIBRARIES} 
+                                   ${VOLK_GNSSSDR_LIBRARIES} 
                                    ${GNURADIO_BLOCKS_LIBRARIES} 
                                    ${GNURADIO_FFT_LIBRARIES} 
                                    ${GNURADIO_FILTER_LIBRARIES} 
                                    ${OPT_LIBRARIES} 
                                    gnss_rx
 )
+
+if(NOT VOLK_GNSSSDR_FOUND)
+    add_dependencies(gnss_sp_libs volk_gnsssdr_module)
+endif(NOT VOLK_GNSSSDR_FOUND)

src/algorithms/libs/byte_x2_to_complex_byte.cc

@@ -0,0 +1,71 @@
+/*!
+ * \file byte_x2_to_complex_byte.cc
+ * \brief Adapts two signed char streams into a std::complex<signed char> stream
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+
+#include "byte_x2_to_complex_byte.h"
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
+
+
+byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte()
+{
+    return byte_x2_to_complex_byte_sptr(new byte_x2_to_complex_byte());
+}
+
+
+
+byte_x2_to_complex_byte::byte_x2_to_complex_byte() : sync_block("byte_x2_to_complex_byte",
+                        gr::io_signature::make (2, 2, sizeof(int8_t)),   // int8_t, defined in stdint.h and included in volk.h (signed char)
+                        gr::io_signature::make (1, 1, sizeof(lv_8sc_t))) // lv_8sc_t is a Volk's typedef for std::complex<signed char>
+{
+    const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t);
+    set_alignment(std::max(1, alignment_multiple));
+}
+
+
+int byte_x2_to_complex_byte::work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items)
+{
+    const int8_t *in0 = (const int8_t *) input_items[0];
+    const int8_t *in1 = (const int8_t *) input_items[1];
+    lv_8sc_t *out = (lv_8sc_t *) output_items[0];
+    // This could be put into a volk kernel
+    int8_t real_part;
+    int8_t imag_part;
+    for(int number = 0; number < noutput_items; number++)
+        {
+            // lv_cmake(r, i) defined at volk/volk_complex.h
+            real_part = *in0++;
+            imag_part = *in1++;
+            *out++ = lv_cmake(real_part, imag_part);
+        }
+    return noutput_items;
+}

src/algorithms/libs/byte_x2_to_complex_byte.h

@@ -0,0 +1,60 @@
+/*!
+ * \file byte_x2_to_complex_byte.h
+ * \brief Adapts two signed char streams into a std::complex<signed char> stream
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_BYTE_X2_TO_COMPLEX_BYTE_H_
+#define GNSS_SDR_BYTE_X2_TO_COMPLEX_BYTE_H_
+
+
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/sync_block.h>
+
+class byte_x2_to_complex_byte;
+
+typedef boost::shared_ptr<byte_x2_to_complex_byte> byte_x2_to_complex_byte_sptr;
+
+byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte();
+
+/*!
+ * \brief This class adapts two signed char streams
+ * into a std::complex<signed char> stream
+ */
+class byte_x2_to_complex_byte : public gr::sync_block
+{
+private:
+    friend byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte();
+public:
+    byte_x2_to_complex_byte();
+
+    int work(int noutput_items,
+            gr_vector_const_void_star &input_items,
+            gr_vector_void_star &output_items);
+};
+
+#endif

src/algorithms/libs/complex_byte_to_float_x2.cc

@@ -0,0 +1,63 @@
+/*!
+ * \file complex_byte_to_float_x2.cc
+ * \brief Adapts a std::complex<signed char> stream into two 16-bits (short) streams
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+
+#include "complex_byte_to_float_x2.h"
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
+
+
+complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2()
+{
+    return complex_byte_to_float_x2_sptr(new complex_byte_to_float_x2());
+}
+
+
+
+complex_byte_to_float_x2::complex_byte_to_float_x2() : sync_block("complex_byte_to_float_x2",
+                        gr::io_signature::make (1, 1, sizeof(lv_8sc_t)), // lv_8sc_t is a Volk's typedef for std::complex<signed char>
+                        gr::io_signature::make (2, 2, sizeof(float)))
+{
+    const int alignment_multiple = volk_get_alignment() / sizeof(float);
+    set_alignment(std::max(1, alignment_multiple));
+}
+
+
+int complex_byte_to_float_x2::work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items)
+{
+    const lv_8sc_t *in = (const lv_8sc_t *) input_items[0];
+    float *out0 = (float*) output_items[0];
+    float *out1 = (float*) output_items[1];
+    const float scalar = 1;
+    volk_8ic_s32f_deinterleave_32f_x2(out0, out1, in, scalar, noutput_items);
+    return noutput_items;
+}

src/algorithms/libs/complex_byte_to_float_x2.h

@@ -0,0 +1,60 @@
+/*!
+ * \file complex_byte_to_float_x2.h
+ * \brief Adapts a std::complex<signed char> stream into two 16-bits (short) streams
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_COMPLEX_BYTE_TO_FLOAT_X2_H_
+#define GNSS_SDR_COMPLEX_BYTE_TO_FLOAT_X2_H_
+
+
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/sync_block.h>
+
+class complex_byte_to_float_x2;
+
+typedef boost::shared_ptr<complex_byte_to_float_x2> complex_byte_to_float_x2_sptr;
+
+complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2();
+
+/*!
+ * \brief This class adapts a std::complex<signed char> stream
+ * into two 16-bits (short) streams
+ */
+class complex_byte_to_float_x2 : public gr::sync_block
+{
+private:
+    friend complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2();
+public:
+    complex_byte_to_float_x2();
+
+    int work(int noutput_items,
+            gr_vector_const_void_star &input_items,
+            gr_vector_void_star &output_items);
+};
+
+#endif

src/algorithms/libs/complex_float_to_complex_byte.cc

@@ -0,0 +1,63 @@
+/*!
+ * \file complex_float_to_complex_byte.cc
+ * \brief Adapts a gr_complex stream into a std::complex<signed char> stream
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+
+#include "complex_float_to_complex_byte.h"
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
+#include "volk_gnsssdr/volk_gnsssdr.h"
+
+
+
+complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte()
+{
+    return complex_float_to_complex_byte_sptr(new complex_float_to_complex_byte());
+}
+
+
+
+complex_float_to_complex_byte::complex_float_to_complex_byte() : sync_block("complex_float_to_complex_byte",
+                        gr::io_signature::make (1, 1, sizeof(gr_complex)),
+                        gr::io_signature::make (1, 1, sizeof(lv_8sc_t))) // lv_8sc_t is a Volk's typedef for std::complex<signed char>
+{
+    const int alignment_multiple = volk_get_alignment() / sizeof(lv_8sc_t);
+    set_alignment(std::max(1, alignment_multiple));
+}
+
+
+int complex_float_to_complex_byte::work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items)
+{
+    const gr_complex *in = (const gr_complex *) input_items[0];
+    lv_8sc_t *out = (lv_8sc_t*) output_items[0];
+    volk_gnsssdr_32fc_convert_8ic(out, in, noutput_items);
+    return noutput_items;
+}

src/algorithms/libs/complex_float_to_complex_byte.h

@@ -0,0 +1,58 @@
+/*!
+ * \file complex_float_to_complex_byte.h
+ * \brief Adapts a gr_complex stream into a std::complex<signed char> stream
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_COMPLEX_FLOAT_TO_COMPLEX_BYTE_H_
+#define GNSS_SDR_COMPLEX_FLOAT_TO_COMPLEX_BYTE_H_
+
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/sync_block.h>
+
+class complex_float_to_complex_byte;
+
+typedef boost::shared_ptr<complex_float_to_complex_byte> complex_float_to_complex_byte_sptr;
+
+complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte();
+
+/*!
+ * \brief This class adapts a gr_complex stream into a std::complex<signed char> stream
+ */
+class complex_float_to_complex_byte : public gr::sync_block
+{
+private:
+    friend complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte();
+public:
+    complex_float_to_complex_byte();
+
+    int work(int noutput_items,
+            gr_vector_const_void_star &input_items,
+            gr_vector_void_star &output_items);
+};
+
+#endif

src/algorithms/libs/cshort_to_float_x2.cc

@@ -0,0 +1,63 @@
+/*!
+ * \file cshort_to_float_x2.cc
+ * \brief Adapts a std::complex<short> stream into two float streams
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+
+#include "cshort_to_float_x2.h"
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
+
+
+cshort_to_float_x2_sptr make_cshort_to_float_x2()
+{
+    return cshort_to_float_x2_sptr(new cshort_to_float_x2());
+}
+
+
+
+cshort_to_float_x2::cshort_to_float_x2() : sync_block("cshort_to_float_x2",
+                        gr::io_signature::make (1, 1, sizeof(lv_16sc_t)), // lv_8sc_t is a Volk's typedef for std::complex<signed char>
+                        gr::io_signature::make (2, 2, sizeof(float)))
+{
+    const int alignment_multiple = volk_get_alignment() / sizeof(lv_16sc_t);
+    set_alignment(std::max(1, alignment_multiple));
+}
+
+
+int cshort_to_float_x2::work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items)
+{
+    const lv_16sc_t *in = (const lv_16sc_t *) input_items[0];
+    float *out0 = (float*) output_items[0];
+    float *out1 = (float*) output_items[1];
+    const float scalar = 1;
+    volk_16ic_s32f_deinterleave_32f_x2(out0, out1, in, scalar, noutput_items);
+    return noutput_items;
+}

src/algorithms/libs/cshort_to_float_x2.h

@@ -0,0 +1,60 @@
+/*!
+ * \file cshort_to_float_x2.h
+ * \brief Adapts a std::complex<short> stream into two float streams
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_CSHORT_TO_FLOAT_X2_H_
+#define GNSS_SDR_CSHORT_TO_FLOAT_X2_H_
+
+
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/sync_block.h>
+
+class cshort_to_float_x2;
+
+typedef boost::shared_ptr<cshort_to_float_x2> cshort_to_float_x2_sptr;
+
+cshort_to_float_x2_sptr make_cshort_to_float_x2();
+
+/*!
+ * \brief This class adapts a std::complex<short> stream
+ * into two 32-bits (float) streams
+ */
+class cshort_to_float_x2 : public gr::sync_block
+{
+private:
+    friend cshort_to_float_x2_sptr make_cshort_to_float_x2();
+public:
+    cshort_to_float_x2();
+
+    int work(int noutput_items,
+            gr_vector_const_void_star &input_items,
+            gr_vector_void_star &output_items);
+};
+
+#endif

src/algorithms/libs/short_x2_to_cshort.cc

@@ -0,0 +1,72 @@
+/*!
+ * \file short_x2_to_cshort.cc
+ * \brief  Adapts two short streams into a std::complex<short> stream
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+
+#include "short_x2_to_cshort.h"
+#include <gnuradio/io_signature.h>
+#include <volk/volk.h>
+
+
+short_x2_to_cshort_sptr make_short_x2_to_cshort()
+{
+    return short_x2_to_cshort_sptr(new short_x2_to_cshort());
+}
+
+
+
+short_x2_to_cshort::short_x2_to_cshort() : sync_block("short_x2_to_cshort",
+                        gr::io_signature::make (2, 2, sizeof(short)),
+                        gr::io_signature::make (1, 1, sizeof(lv_16sc_t))) // lv_8sc_t is a Volk's typedef for std::complex<signed char>
+{
+    const int alignment_multiple = volk_get_alignment() / sizeof(lv_16sc_t);
+    set_alignment(std::max(1, alignment_multiple));
+}
+
+
+int short_x2_to_cshort::work(int noutput_items,
+        gr_vector_const_void_star &input_items,
+        gr_vector_void_star &output_items)
+{
+    const short *in0 = (const short *) input_items[0];
+    const short *in1 = (const short *) input_items[1];
+    lv_16sc_t *out = (lv_16sc_t *) output_items[0];
+    // This could be put into a volk kernel
+    short real_part;
+    short imag_part;
+    for(int number = 0; number < noutput_items; number++)
+        {
+            // lv_cmake(r, i) defined at volk/volk_complex.h
+            real_part = *in0++;
+            imag_part = *in1++;
+            *out++ = lv_cmake(real_part, imag_part);
+        }
+
+    return noutput_items;
+}

src/algorithms/libs/short_x2_to_cshort.h

@@ -0,0 +1,59 @@
+/*!
+ * \file short_x2_to_cshort.h
+ * \brief Adapts two short streams into a std::complex<short> stream
+ * \author Carles Fernandez Prades, cfernandez(at)cttc.es
+ *
+ * -------------------------------------------------------------------------
+ *
+ * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ *
+ * GNSS-SDR is a software defined Global Navigation
+ *          Satellite Systems receiver
+ *
+ * This file is part of GNSS-SDR.
+ *
+ * GNSS-SDR is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GNSS-SDR is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef GNSS_SDR_SHORT_X2_TO_CSHORT_H_
+#define GNSS_SDR_SHORT_X2_TO_CSHORT_H_
+
+
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/sync_block.h>
+
+class short_x2_to_cshort;
+
+typedef boost::shared_ptr<short_x2_to_cshort> short_x2_to_cshort_sptr;
+
+short_x2_to_cshort_sptr make_short_x2_to_cshort();
+
+/*!
+ * \brief This class adapts two short streams into a std::complex<short> stream
+ */
+class short_x2_to_cshort : public gr::sync_block
+{
+private:
+    friend short_x2_to_cshort_sptr make_short_x2_to_cshort();
+public:
+    short_x2_to_cshort();
+
+    int work(int noutput_items,
+            gr_vector_const_void_star &input_items,
+            gr_vector_void_star &output_items);
+};
+
+#endif