From f0f1ebf70ea2222f97bb7445805ec7466dbcd22e Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Fri, 17 May 2019 17:11:02 +0200 Subject: osmux: Extend osmux_out_handle and add new API to set rtp payload_type Previously payload_type was always hardcoded to 98 for generated rtp packets from incoming osmux frame. Change-Id: I5cbeb494a8932953d9fd2dc24dacf8cd97fd84e4 --- tests/jibuf/jibuf_tool.c | 2 +- tests/osmo-pcap-test/osmux_test.c | 2 +- tests/osmux/osmux_test.c | 2 +- tests/osmux/osmux_test2.c | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/jibuf/jibuf_tool.c b/tests/jibuf/jibuf_tool.c index bd444a7..df11131 100644 --- a/tests/jibuf/jibuf_tool.c +++ b/tests/jibuf/jibuf_tool.c @@ -517,7 +517,7 @@ void pcap_test() { osmo_pcap.timer.cb = pcap_pkt_timer_cb; if(opt_osmux) { - osmux_xfrm_output_init(&pcap_osmux_h, 0); + osmux_xfrm_output_init2(&pcap_osmux_h, 0, 98); osmux_xfrm_output_set_tx_cb(&pcap_osmux_h, glue_cb, NULL); } diff --git a/tests/osmo-pcap-test/osmux_test.c b/tests/osmo-pcap-test/osmux_test.c index 7ec78a0..9163753 100644 --- a/tests/osmo-pcap-test/osmux_test.c +++ b/tests/osmo-pcap-test/osmux_test.c @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) osmo_pcap.timer.cb = osmo_pcap_pkt_timer_cb; osmux_xfrm_input_init(&h_input); - osmux_xfrm_output_init(&h_output); + osmux_xfrm_output_init2(&h_output, 0, 98); osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL); /* first run */ diff --git a/tests/osmux/osmux_test.c b/tests/osmux/osmux_test.c index 704ccbc..e2eb777 100644 --- a/tests/osmux/osmux_test.c +++ b/tests/osmux/osmux_test.c @@ -269,7 +269,7 @@ int main(void) osmo_init_logging2(tall_ctx, &osmux_test_log_info); log_set_log_level(osmo_stderr_target, LOGL_DEBUG); - osmux_xfrm_output_init(&h_output, 0x7000000); + osmux_xfrm_output_init2(&h_output, 0x7000000, 98); osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, NULL); /* If the test takes longer than 10 seconds, abort it */ diff --git a/tests/osmux/osmux_test2.c b/tests/osmux/osmux_test2.c index ecd9296..ffe1101 100644 --- a/tests/osmux/osmux_test2.c +++ b/tests/osmux/osmux_test2.c @@ -164,7 +164,7 @@ static void test_output_consecutive(void) clock_override_enable(true); clock_override_set(0, 0); osmux_init(32); - osmux_xfrm_output_init(&h_output, 0x7000000); + osmux_xfrm_output_init2(&h_output, 0x7000000, 98); h_output.rtp_seq = (uint16_t)50; h_output.rtp_timestamp = (uint32_t)500; osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output); @@ -226,7 +226,7 @@ static void test_output_interleaved(void) clock_override_enable(true); clock_override_set(0, 0); osmux_init(32); - osmux_xfrm_output_init(&h_output, 0x7000000); + osmux_xfrm_output_init2(&h_output, 0x7000000, 98); h_output.rtp_seq = (uint16_t)50; h_output.rtp_timestamp = (uint32_t)500; osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output); @@ -263,7 +263,7 @@ static void test_output_2together(void) clock_override_enable(true); clock_override_set(0, 0); osmux_init(32); - osmux_xfrm_output_init(&h_output, 0x7000000); + osmux_xfrm_output_init2(&h_output, 0x7000000, 98); h_output.rtp_seq = (uint16_t)50; h_output.rtp_timestamp = (uint32_t)500; osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output); @@ -297,7 +297,7 @@ static void test_output_frame_lost(void) clock_override_enable(true); clock_override_set(0, 0); osmux_init(32); - osmux_xfrm_output_init(&h_output, 0x7000000); + osmux_xfrm_output_init2(&h_output, 0x7000000, 98); h_output.rtp_seq = (uint16_t)50; h_output.rtp_timestamp = (uint32_t)500; osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output); @@ -329,7 +329,7 @@ static void test_output_flush(void) clock_override_enable(true); clock_override_set(0, 0); osmux_init(32); - osmux_xfrm_output_init(&h_output, 0x7000000); + osmux_xfrm_output_init2(&h_output, 0x7000000, 98); h_output.rtp_seq = (uint16_t)50; h_output.rtp_timestamp = (uint32_t)500; osmux_xfrm_output_set_tx_cb(&h_output, tx_cb, &h_output); -- cgit v1.2.3