Browse Source

MT#56471 defuse mix_buffer without transcoding

No need to compile something that isn't used.

closes #1648

Change-Id: I33ccfe90d687a5c58f14039d0404a3cfcfa93aac
pull/1646/head
Richard Fuchs 3 years ago
parent
commit
62c1cca555
2 changed files with 8 additions and 4 deletions
  1. +4
    -0
      lib/mix_buffer.c
  2. +4
    -4
      t/Makefile

+ 4
- 0
lib/mix_buffer.c View File

@ -1,3 +1,5 @@
#ifdef WITH_TRANSCODING
#include "mix_buffer.h" #include "mix_buffer.h"
#include <libavutil/samplefmt.h> #include <libavutil/samplefmt.h>
#include <stdlib.h> #include <stdlib.h>
@ -320,3 +322,5 @@ void mix_buffer_destroy(struct mix_buffer *mb) {
free_ssrc_hash(&mb->ssrc_hash); free_ssrc_hash(&mb->ssrc_hash);
mutex_destroy(&mb->lock); mutex_destroy(&mb->lock);
} }
#endif

+ 4
- 4
t/Makefile View File

@ -62,7 +62,7 @@ LDLIBS+= -lhiredis
LDLIBS+= $(shell mysql_config --libs) LDLIBS+= $(shell mysql_config --libs)
endif endif
SRCS= test-bitstr.c aes-crypt.c aead-aes-crypt.c test-const_str_hash.strhash.c test-mix-buffer.c
SRCS= test-bitstr.c aes-crypt.c aead-aes-crypt.c test-const_str_hash.strhash.c
LIBSRCS= loglib.c auxlib.c str.c rtplib.c ssllib.c mix_buffer.c LIBSRCS= loglib.c auxlib.c str.c rtplib.c ssllib.c mix_buffer.c
DAEMONSRCS= crypto.c ssrc.c aux.c rtp.c DAEMONSRCS= crypto.c ssrc.c aux.c rtp.c
HASHSRCS= HASHSRCS=
@ -70,7 +70,7 @@ HASHSRCS=
ifeq ($(with_transcoding),yes) ifeq ($(with_transcoding),yes)
SRCS+= test-transcode.c test-dtmf-detect.c test-payload-tracker.c test-resample.c test-stats.c SRCS+= test-transcode.c test-dtmf-detect.c test-payload-tracker.c test-resample.c test-stats.c
SRCS+= spandsp_recv_fax_pcm.c spandsp_recv_fax_t38.c spandsp_send_fax_pcm.c \ SRCS+= spandsp_recv_fax_pcm.c spandsp_recv_fax_t38.c spandsp_send_fax_pcm.c \
spandsp_send_fax_t38.c
spandsp_send_fax_t38.c test-mix-buffer.c
ifeq ($(with_amr_tests),yes) ifeq ($(with_amr_tests),yes)
SRCS+= test-amr-decode.c test-amr-encode.c SRCS+= test-amr-decode.c test-amr-encode.c
endif endif
@ -95,9 +95,9 @@ include ../lib/common.Makefile
daemon-tests-intfs daemon-tests-stats daemon-tests-delay-buffer daemon-tests-delay-timing \ daemon-tests-intfs daemon-tests-stats daemon-tests-delay-buffer daemon-tests-delay-timing \
daemon-tests-evs daemon-tests-player-cache daemon-tests-redis daemon-tests-evs daemon-tests-player-cache daemon-tests-redis
TESTS= test-bitstr aes-crypt aead-aes-crypt test-const_str_hash.strhash test-mix-buffer
TESTS= test-bitstr aes-crypt aead-aes-crypt test-const_str_hash.strhash
ifeq ($(with_transcoding),yes) ifeq ($(with_transcoding),yes)
TESTS+= test-transcode test-dtmf-detect test-payload-tracker test-resample test-stats
TESTS+= test-transcode test-dtmf-detect test-payload-tracker test-resample test-stats test-mix-buffer
ifeq ($(with_amr_tests),yes) ifeq ($(with_amr_tests),yes)
TESTS+= test-amr-decode test-amr-encode TESTS+= test-amr-decode test-amr-encode
endif endif


Loading…
Cancel
Save