Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
mediastreamer2
Commits
f79e458b
Commit
f79e458b
authored
Jul 03, 2015
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix destruction of filters in the tester.
parent
76a4f813
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
tester/mediastreamer2_tester_private.c
tester/mediastreamer2_tester_private.c
+16
-16
No files found.
tester/mediastreamer2_tester_private.c
View file @
f79e458b
...
...
@@ -149,10 +149,10 @@ void ms_tester_create_filters(unsigned int filter_mask) {
}
#define DESTROY_FILTER(mask, filter) \
if ((filter_mask & mask) & (filter != NULL)) { \
if ((filter_mask & mask) &
&
(filter != NULL)) { \
ms_filter_destroy(filter); \
filter = NULL; \
} \
filter = NULL
void
ms_tester_destroy_filter
(
MSFilter
**
filter
)
{
BC_ASSERT_PTR_NOT_NULL
(
filter
);
...
...
@@ -163,20 +163,20 @@ void ms_tester_destroy_filter(MSFilter **filter) {
}
void
ms_tester_destroy_filters
(
unsigned
int
filter_mask
)
{
DESTROY_FILTER
(
FILTER_MASK_FILEPLAY
,
ms_tester_fileplay
)
;
DESTROY_FILTER
(
FILTER_MASK_FILEREC
,
ms_tester_filerec
)
;
DESTROY_FILTER
(
FILTER_MASK_DTMFGEN
,
ms_tester_dtmfgen
)
;
DESTROY_FILTER
(
FILTER_MASK_TONEDET
,
ms_tester_tonedet
)
;
DESTROY_FILTER
(
FILTER_MASK_VOIDSOURCE
,
ms_tester_voidsource
)
;
DESTROY_FILTER
(
FILTER_MASK_VOIDSINK
,
ms_tester_voidsink
)
;
DESTROY_FILTER
(
FILTER_MASK_ENCODER
,
ms_tester_encoder
)
;
DESTROY_FILTER
(
FILTER_MASK_DECODER
,
ms_tester_decoder
)
;
DESTROY_FILTER
(
FILTER_MASK_RTPRECV
,
ms_tester_rtprecv
)
;
DESTROY_FILTER
(
FILTER_MASK_RTPSEND
,
ms_tester_rtpsend
)
;
DESTROY_FILTER
(
FILTER_MASK_RESAMPLER
,
ms_tester_resampler
)
;
DESTROY_FILTER
(
FILTER_MASK_SOUNDWRITE
,
ms_tester_soundwrite
)
;
DESTROY_FILTER
(
FILTER_MASK_SOUNDREAD
,
ms_tester_soundread
)
;
DESTROY_FILTER
(
FILTER_MASK_VIDEOCAPTURE
,
ms_tester_videocapture
)
;
DESTROY_FILTER
(
FILTER_MASK_FILEPLAY
,
ms_tester_fileplay
)
DESTROY_FILTER
(
FILTER_MASK_FILEREC
,
ms_tester_filerec
)
DESTROY_FILTER
(
FILTER_MASK_DTMFGEN
,
ms_tester_dtmfgen
)
DESTROY_FILTER
(
FILTER_MASK_TONEDET
,
ms_tester_tonedet
)
DESTROY_FILTER
(
FILTER_MASK_VOIDSOURCE
,
ms_tester_voidsource
)
DESTROY_FILTER
(
FILTER_MASK_VOIDSINK
,
ms_tester_voidsink
)
DESTROY_FILTER
(
FILTER_MASK_ENCODER
,
ms_tester_encoder
)
DESTROY_FILTER
(
FILTER_MASK_DECODER
,
ms_tester_decoder
)
DESTROY_FILTER
(
FILTER_MASK_RTPRECV
,
ms_tester_rtprecv
)
DESTROY_FILTER
(
FILTER_MASK_RTPSEND
,
ms_tester_rtpsend
)
DESTROY_FILTER
(
FILTER_MASK_RESAMPLER
,
ms_tester_resampler
)
DESTROY_FILTER
(
FILTER_MASK_SOUNDWRITE
,
ms_tester_soundwrite
)
DESTROY_FILTER
(
FILTER_MASK_SOUNDREAD
,
ms_tester_soundread
)
DESTROY_FILTER
(
FILTER_MASK_VIDEOCAPTURE
,
ms_tester_videocapture
)
}
void
ms_tester_tone_generation_loop
(
void
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment