uhd: renamed convert markup to format

removed convert args

added simd level

got orc and neon updated

3 files changed, 40 insertions, 40 deletions

diff --git a/host/tests/convert_test.cpp b/host/tests/convert_test.cpp
index 9dabcf54e..b63ff6752 100644
--- a/host/tests/convert_test.cpp
+++ b/host/tests/convert_test.cpp
@@ -75,7 +75,7 @@ static void test_convert_types_sc16(
     //run the loopback and test
     convert::id_type in_id = id;
     convert::id_type out_id = id;
-    std::swap(out_id.input_markup, out_id.output_markup);
+    std::swap(out_id.input_format, out_id.output_format);
     std::swap(out_id.num_inputs, out_id.num_outputs);
     loopback(nsamps, in_id, out_id, input, output);
     BOOST_CHECK_EQUAL_COLLECTIONS(input.begin(), input.end(), output.begin(), output.end());
@@ -83,9 +83,9 @@ static void test_convert_types_sc16(
 
 BOOST_AUTO_TEST_CASE(test_convert_types_be_sc16){
     convert::id_type id;
-    id.input_markup = "sc16";
+    id.input_format = "sc16";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_be";
+    id.output_format = "sc16_item32_be";
     id.num_outputs = 1;
 
     //try various lengths to test edge cases
@@ -96,9 +96,9 @@ BOOST_AUTO_TEST_CASE(test_convert_types_be_sc16){
 
 BOOST_AUTO_TEST_CASE(test_convert_types_le_sc16){
     convert::id_type id;
-    id.input_markup = "sc16";
+    id.input_format = "sc16";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_le";
+    id.output_format = "sc16_item32_le";
     id.num_outputs = 1;
 
     //try various lengths to test edge cases
@@ -126,7 +126,7 @@ static void test_convert_types_for_floats(
     //run the loopback and test
     convert::id_type in_id = id;
     convert::id_type out_id = id;
-    std::swap(out_id.input_markup, out_id.output_markup);
+    std::swap(out_id.input_format, out_id.output_format);
     std::swap(out_id.num_inputs, out_id.num_outputs);
     loopback(nsamps, in_id, out_id, input, output);
     for (size_t i = 0; i < nsamps; i++){
@@ -137,9 +137,9 @@ static void test_convert_types_for_floats(
 
 BOOST_AUTO_TEST_CASE(test_convert_types_be_fc32){
     convert::id_type id;
-    id.input_markup = "fc32";
+    id.input_format = "fc32";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_be";
+    id.output_format = "sc16_item32_be";
     id.num_outputs = 1;
 
     //try various lengths to test edge cases
@@ -150,9 +150,9 @@ BOOST_AUTO_TEST_CASE(test_convert_types_be_fc32){
 
 BOOST_AUTO_TEST_CASE(test_convert_types_le_fc32){
     convert::id_type id;
-    id.input_markup = "fc32";
+    id.input_format = "fc32";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_le";
+    id.output_format = "sc16_item32_le";
     id.num_outputs = 1;
 
     //try various lengths to test edge cases
@@ -163,9 +163,9 @@ BOOST_AUTO_TEST_CASE(test_convert_types_le_fc32){
 
 BOOST_AUTO_TEST_CASE(test_convert_types_be_fc64){
     convert::id_type id;
-    id.input_markup = "fc64";
+    id.input_format = "fc64";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_be";
+    id.output_format = "sc16_item32_be";
     id.num_outputs = 1;
 
     //try various lengths to test edge cases
@@ -176,9 +176,9 @@ BOOST_AUTO_TEST_CASE(test_convert_types_be_fc64){
 
 BOOST_AUTO_TEST_CASE(test_convert_types_le_fc64){
     convert::id_type id;
-    id.input_markup = "fc64";
+    id.input_format = "fc64";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_le";
+    id.output_format = "sc16_item32_le";
     id.num_outputs = 1;
 
     //try various lengths to test edge cases
@@ -192,15 +192,15 @@ BOOST_AUTO_TEST_CASE(test_convert_types_le_fc64){
  **********************************************************************/
 BOOST_AUTO_TEST_CASE(test_convert_types_fc32_to_sc16){
     convert::id_type in_id;
-    in_id.input_markup = "fc32";
+    in_id.input_format = "fc32";
     in_id.num_inputs = 1;
-    in_id.output_markup = "sc16_item32_le";
+    in_id.output_format = "sc16_item32_le";
     in_id.num_outputs = 1;
 
     convert::id_type out_id;
-    out_id.input_markup = "sc16_item32_le";
+    out_id.input_format = "sc16_item32_le";
     out_id.num_inputs = 1;
-    out_id.output_markup = "sc16";
+    out_id.output_format = "sc16";
     out_id.num_outputs = 1;
 
     const size_t nsamps = 13;
@@ -233,15 +233,15 @@ BOOST_AUTO_TEST_CASE(test_convert_types_fc32_to_sc16){
  **********************************************************************/
 BOOST_AUTO_TEST_CASE(test_convert_types_sc16_to_fc32){
     convert::id_type in_id;
-    in_id.input_markup = "sc16";
+    in_id.input_format = "sc16";
     in_id.num_inputs = 1;
-    in_id.output_markup = "sc16_item32_le";
+    in_id.output_format = "sc16_item32_le";
     in_id.num_outputs = 1;
 
     convert::id_type out_id;
-    out_id.input_markup = "sc16_item32_le";
+    out_id.input_format = "sc16_item32_le";
     out_id.num_inputs = 1;
-    out_id.output_markup = "fc32";
+    out_id.output_format = "fc32";
     out_id.num_outputs = 1;
 
     const size_t nsamps = 13;
diff --git a/host/tests/sph_recv_test.cpp b/host/tests/sph_recv_test.cpp
index 6fab2ad5f..85d06aa0d 100644
--- a/host/tests/sph_recv_test.cpp
+++ b/host/tests/sph_recv_test.cpp
@@ -107,9 +107,9 @@ private:
 BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_normal){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     dummy_recv_xport_class dummy_recv_xport("big");
@@ -178,9 +178,9 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_normal){
 BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_sequence_error){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     dummy_recv_xport_class dummy_recv_xport("big");
@@ -259,9 +259,9 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_sequence_error){
 BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_inline_message){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     dummy_recv_xport_class dummy_recv_xport("big");
@@ -351,9 +351,9 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_one_channel_inline_message){
 BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_normal){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     uhd::transport::vrt::if_packet_info_t ifpi;
@@ -434,9 +434,9 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_normal){
 BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_sequence_error){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     uhd::transport::vrt::if_packet_info_t ifpi;
@@ -527,9 +527,9 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_sequence_error){
 BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_time_error){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     uhd::transport::vrt::if_packet_info_t ifpi;
@@ -615,9 +615,9 @@ BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_time_error){
 BOOST_AUTO_TEST_CASE(test_sph_recv_multi_channel_fragment){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "sc16_item32_be";
+    id.input_format = "sc16_item32_be";
     id.num_inputs = 1;
-    id.output_markup = "fc32";
+    id.output_format = "fc32";
     id.num_outputs = 1;
 
     uhd::transport::vrt::if_packet_info_t ifpi;
diff --git a/host/tests/sph_send_test.cpp b/host/tests/sph_send_test.cpp
index 9a91008af..25a3f97ee 100644
--- a/host/tests/sph_send_test.cpp
+++ b/host/tests/sph_send_test.cpp
@@ -92,9 +92,9 @@ private:
 BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_one_packet_mode){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "fc32";
+    id.input_format = "fc32";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_be";
+    id.output_format = "sc16_item32_be";
     id.num_outputs = 1;
 
     dummy_send_xport_class dummy_send_xport("big");
@@ -150,9 +150,9 @@ BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_one_packet_mode){
 BOOST_AUTO_TEST_CASE(test_sph_send_one_channel_full_buffer_mode){
 ////////////////////////////////////////////////////////////////////////
     uhd::convert::id_type id;
-    id.input_markup = "fc32";
+    id.input_format = "fc32";
     id.num_inputs = 1;
-    id.output_markup = "sc16_item32_be";
+    id.output_format = "sc16_item32_be";
     id.num_outputs = 1;
 
     dummy_send_xport_class dummy_send_xport("big");