Skip to content

Commit 5243fbd

Browse files
seven1240andywolk
seven1240
authored and
andywolk
committed
[core, mod_av] move switch_packetizer to core
1 parent 64aebc3 commit 5243fbd

File tree

6 files changed

+31
-58
lines changed

6 files changed

+31
-58
lines changed

‎Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ libfreeswitch_la_SOURCES = \
364364
src/switch_version.c \
365365
src/switch_core_media.c \
366366
src/switch_core_video.c \
367+
src/switch_packetizer.c \
367368
src/switch_sdp.c \
368369
src/switch_scheduler.c \
369370
src/switch_core_db.c \

‎src/mod/applications/mod_av/switch_packetizer.h ‎src/include/switch_packetizer.h

File renamed without changes.

‎src/mod/applications/mod_av/Makefile.am

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ endif
1313

1414
noinst_LTLIBRARIES = libavmod.la
1515

16-
libavmod_la_SOURCES = mod_av.c avformat.c avcodec.c switch_packetizer.c
16+
libavmod_la_SOURCES = mod_av.c avformat.c avcodec.c
1717
libavmod_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(RESAMPLE_CFLAGS)
1818

1919
mod_LTLIBRARIES = mod_av.la
@@ -22,16 +22,13 @@ mod_av_la_LIBADD = libavmod.la $(switch_builddir)/libfreeswitch.la $(AVFORMAT_
2222
mod_av_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz
2323

2424

25-
noinst_PROGRAMS = test/test_mod_av test/test_avformat test/test_packetizer
25+
noinst_PROGRAMS = test/test_mod_av test/test_avformat
2626
test_test_mod_av_CFLAGS = $(SWITCH_AM_CFLAGS) -I../ -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(RESAMPLE_CFLAGS)
2727
test_test_mod_av_LDFLAGS = $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS) $(AVUTIL_LIBS) $(RESAMPLE_LIBS) -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS)
2828
test_test_mod_av_LDADD = libavmod.la $(switch_builddir)/libfreeswitch.la
2929
test_test_avformat_CFLAGS = $(SWITCH_AM_CFLAGS) -I../ -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(RESAMPLE_CFLAGS)
3030
test_test_avformat_LDFLAGS = $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS) $(AVUTIL_LIBS) $(RESAMPLE_LIBS) -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS)
3131
test_test_avformat_LDADD = libavmod.la $(switch_builddir)/libfreeswitch.la
32-
test_test_packetizer_CFLAGS = $(SWITCH_AM_CFLAGS) -I../ -DSWITCH_TEST_BASE_DIR_FOR_CONF=\"${abs_builddir}/test\" -DSWITCH_TEST_BASE_DIR_OVERRIDE=\"${abs_builddir}/test\" $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(RESAMPLE_CFLAGS)
33-
test_test_packetizer_LDFLAGS = $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS) $(AVUTIL_LIBS) $(RESAMPLE_LIBS) -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS)
34-
test_test_packetizer_LDADD = libavmod.la $(switch_builddir)/libfreeswitch.la
3532

3633
TESTS = $(noinst_PROGRAMS)
3734

‎src/mod/applications/mod_av/switch_packetizer.c ‎src/switch_packetizer.c

File renamed without changes.

‎tests/unit/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ include $(top_srcdir)/build/modmake.rulesam
22

33
noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx switch_core_file \
44
switch_ivr_play_say switch_core_codec switch_rtp switch_xml
5-
noinst_PROGRAMS += switch_core_video switch_core_db switch_vad switch_core_asr test_sofia
5+
noinst_PROGRAMS += switch_core_video switch_core_db switch_vad switch_packetizer test_sofia switch_core_asr
66

77
AM_LDFLAGS += -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) $(openssl_LIBS)
88
AM_LDFLAGS += $(FREESWITCH_LIBS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)

‎src/mod/applications/mod_av/test/test_packetizer.c ‎tests/unit/switch_packetizer.c

+27-52
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
3-
* Copyright (C) 2005-2018, Anthony Minessale II <anthm@freeswitch.org>
3+
* Copyright (C) 2005-2020, Anthony Minessale II <anthm@freeswitch.org>
44
*
55
* Version: MPL 1.1
66
*
@@ -24,7 +24,7 @@
2424
* Contributor(s):
2525
*
2626
*
27-
* test_avformat -- avformat tests
27+
* switch_packetizer.c unit test
2828
*
2929
*/
3030

@@ -35,11 +35,10 @@
3535

3636
FST_CORE_BEGIN("conf")
3737
{
38-
FST_MODULE_BEGIN(mod_av, mod_av_test)
38+
FST_SUITE_BEGIN(switch_packetizer)
3939
{
4040
FST_SETUP_BEGIN()
4141
{
42-
fst_requires_module("mod_av");
4342
}
4443
FST_SETUP_END()
4544

@@ -52,33 +51,33 @@ FST_CORE_BEGIN("conf")
5251
uint8_t h264data[] = {0, 0, 0, 1, 0x67, 1, 2, 0, 0, 0, 1, 0x68, 1, 2, 0, 0, 0, 1, 0x65, 1, 2, 3, 4, 5, 6};
5352

5453
frame.data = data;
55-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
54+
frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
5655
switch_set_flag(&frame, SFF_ENCODED);
5756

5857
status = switch_packetizer_feed(packetizer, h264data, sizeof(h264data));
5958
fst_requires(status == SWITCH_STATUS_SUCCESS);
6059
status = switch_packetizer_read(packetizer, &frame);
61-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
60+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
6261
fst_requires(status == SWITCH_STATUS_MORE_DATA);
6362
fst_requires(frame.datalen == 3);
6463
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
6564
status = switch_packetizer_read(packetizer, &frame);
66-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
65+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
6766
fst_requires(status == SWITCH_STATUS_MORE_DATA);
6867
fst_requires(frame.datalen == 3);
6968
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
7069
status = switch_packetizer_read(packetizer, &frame);
71-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
70+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
7271
fst_requires(status == SWITCH_STATUS_MORE_DATA);
7372
fst_requires(frame.datalen == 4);
7473
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
7574
status = switch_packetizer_read(packetizer, &frame);
76-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
75+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
7776
fst_requires(status == SWITCH_STATUS_MORE_DATA);
7877
fst_requires(frame.datalen == 4);
7978
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
8079
status = switch_packetizer_read(packetizer, &frame);
81-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
80+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
8281
fst_requires(status == SWITCH_STATUS_SUCCESS);
8382
fst_requires(frame.datalen == 4);
8483
switch_packetizer_close(&packetizer);
@@ -94,33 +93,33 @@ FST_CORE_BEGIN("conf")
9493
uint8_t h264data[] = {0, 0, 0, 3, 0x67, 1, 2, 0, 0, 0, 3, 0x68, 1, 2, 0, 0, 0, 7, 0x65, 1, 2, 3, 4, 5, 6};
9594

9695
frame.data = data;
97-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
96+
frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
9897
switch_set_flag(&frame, SFF_ENCODED);
9998

10099
status = switch_packetizer_feed(packetizer, h264data, sizeof(h264data));
101100
fst_requires(status == SWITCH_STATUS_SUCCESS);
102101
status = switch_packetizer_read(packetizer, &frame);
103-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
102+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
104103
fst_requires(status == SWITCH_STATUS_MORE_DATA);
105104
fst_requires(frame.datalen == 3);
106105
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
107106
status = switch_packetizer_read(packetizer, &frame);
108-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
107+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
109108
fst_requires(status == SWITCH_STATUS_MORE_DATA);
110109
fst_requires(frame.datalen == 3);
111110
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
112111
status = switch_packetizer_read(packetizer, &frame);
113-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
112+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
114113
fst_requires(status == SWITCH_STATUS_MORE_DATA);
115114
fst_requires(frame.datalen == 4);
116115
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
117116
status = switch_packetizer_read(packetizer, &frame);
118-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
117+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
119118
fst_requires(status == SWITCH_STATUS_MORE_DATA);
120119
fst_requires(frame.datalen == 4);
121120
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
122121
status = switch_packetizer_read(packetizer, &frame);
123-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
122+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
124123
fst_requires(status == SWITCH_STATUS_SUCCESS);
125124
fst_requires(frame.datalen == 4);
126125
fst_check(frame.m == 1);
@@ -138,7 +137,7 @@ FST_CORE_BEGIN("conf")
138137
uint8_t extradata[] = {0x01, 0x64, 0x00, 0x1e, 0xff, 0xe1, 0x00, 0x03, 0x67, 0x64, 0x00, 0xe1, 0x00, 0x03, 0x68, 0x01, 0x02};
139138
// 1 fps 3 bytes 1pps 3 bytes
140139
frame.data = data;
141-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
140+
frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
142141
switch_set_flag(&frame, SFF_ENCODED);
143142

144143
status = switch_packetizer_feed_extradata(packetizer, extradata, sizeof(extradata));
@@ -148,51 +147,51 @@ FST_CORE_BEGIN("conf")
148147
fst_requires(status == SWITCH_STATUS_SUCCESS);
149148

150149
status = switch_packetizer_read(packetizer, &frame);
151-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
150+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u\n", frame.datalen);
152151
fst_requires(status == SWITCH_STATUS_MORE_DATA);
153152
fst_requires(frame.datalen == 3);
154153
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x06);
155154

156155
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
157156
status = switch_packetizer_read(packetizer, &frame);
158-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
157+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
159158
fst_requires(status == SWITCH_STATUS_MORE_DATA);
160159
fst_requires(frame.datalen == 3);
161160
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x09);
162161

163162
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
164163
status = switch_packetizer_read(packetizer, &frame);
165-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
164+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
166165
fst_requires(status == SWITCH_STATUS_MORE_DATA);
167166
fst_requires(frame.datalen == 3);
168167
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x07);
169168

170169
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
171170
status = switch_packetizer_read(packetizer, &frame);
172-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
171+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
173172
fst_requires(status == SWITCH_STATUS_MORE_DATA);
174173
fst_requires(frame.datalen == 3);
175174
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x08);
176175

177176
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
178177
status = switch_packetizer_read(packetizer, &frame);
179-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
178+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
180179
fst_requires(status == SWITCH_STATUS_MORE_DATA);
181180
fst_requires(frame.datalen == 4);
182181
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x1c);
183182
fst_check(frame.m == 0);
184183

185184
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
186185
status = switch_packetizer_read(packetizer, &frame);
187-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
186+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
188187
fst_requires(status == SWITCH_STATUS_MORE_DATA);
189188
fst_requires(frame.datalen == 4);
190189
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x1c);
191190
fst_check(frame.m == 0);
192191

193192
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
194193
status = switch_packetizer_read(packetizer, &frame);
195-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
194+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%u %x\n", frame.datalen, *(uint8_t *)frame.data);
196195
fst_requires(status == SWITCH_STATUS_SUCCESS);
197196
fst_requires(frame.datalen == 4);
198197
fst_check((*(uint8_t *)frame.data & 0x1f) == 0x1c);
@@ -210,47 +209,23 @@ FST_CORE_BEGIN("conf")
210209
uint8_t h264data[] = {0, 0, 2, 9, 0x67, 1, 2, 0, 0, 0, 0, 0x68, 1, 2, 0, 0, 0, 0, 0x65, 1, 2, 3, 4, 5, 6};
211210

212211
frame.data = data;
213-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
212+
frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
214213
switch_set_flag(&frame, SFF_ENCODED);
215214

216215
status = switch_packetizer_feed(packetizer, h264data, sizeof(h264data));
217216
fst_requires(status == SWITCH_STATUS_SUCCESS);
218217
status = switch_packetizer_read(packetizer, &frame);
219-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
220-
fst_requires(status == SWITCH_STATUS_MORE_DATA);
221-
fst_requires(frame.datalen == 3);
222-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
223-
status = switch_packetizer_read(packetizer, &frame);
224-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
225-
fst_requires(status == SWITCH_STATUS_MORE_DATA);
226-
fst_requires(frame.datalen == 3);
227-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
228-
status = switch_packetizer_read(packetizer, &frame);
229-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
230-
fst_requires(status == SWITCH_STATUS_MORE_DATA);
231-
fst_requires(frame.datalen == 4);
232-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
233-
status = switch_packetizer_read(packetizer, &frame);
234-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
235-
fst_requires(status == SWITCH_STATUS_MORE_DATA);
236-
fst_requires(frame.datalen == 4);
237-
frame.datalen = SWITCH_RECOMMENDED_BUFFER_SIZE;
238-
status = switch_packetizer_read(packetizer, &frame);
239-
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%u\n", frame.datalen);
240-
fst_requires(status == SWITCH_STATUS_SUCCESS);
241-
fst_requires(frame.datalen == 4);
218+
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "status = %d datalen = %u\n", status, frame.datalen);
219+
fst_requires(status == SWITCH_STATUS_FALSE);
242220
switch_packetizer_close(&packetizer);
243221
}
244222
FST_TEST_END()
245223

246224
FST_TEARDOWN_BEGIN()
247225
{
248-
//const char *err = NULL;
249-
switch_sleep(1000000);
250-
//fst_check(switch_loadable_module_unload_module(SWITCH_GLOBAL_dirs.mod_dir, (char *)"mod_av", SWITCH_TRUE, &err) == SWITCH_STATUS_SUCCESS);
251226
}
252227
FST_TEARDOWN_END()
253228
}
254-
FST_MODULE_END()
229+
FST_SUITE_END()
255230
}
256231
FST_CORE_END()

0 commit comments

Comments
 (0)