Commit 85798979 authored by Ghislain MARY's avatar Ghislain MARY

Fix compilation.

parent 28895a6d
......@@ -21,6 +21,7 @@
#include <mediastreamer2/msqueue.h>
static void push_nalu(const uint8_t *begin, const uint8_t *end, MSQueue *nalus){
unsigned ecount = 0;
const uint8_t *src=begin;
size_t nalu_len = (end-begin);
uint8_t nalu_byte = *src++;
......@@ -35,7 +36,6 @@ static void push_nalu(const uint8_t *begin, const uint8_t *end, MSQueue *nalus)
Within the NAL unit, the following three-byte sequence shall not occur at any byte-aligned position: 0x000000, 0x000001, 0x00002
*/
*m->b_wptr++=nalu_byte;
unsigned ecount = 0;
while (src<end-3) {
if (src[0]==0 && src[1]==0 && src[2]==3){
*m->b_wptr++=0;
......
......@@ -214,6 +214,8 @@ void start_adaptive_stream(MSFormatType type, stream_manager_t ** pmarielle, str
PayloadType* pt;
MediaStream *marielle_ms,*margaux_ms;
OrtpNetworkSimulatorParams params={0};
char* recorded_file = NULL;
char* file = bc_tester_res(HELLO_16K_1S_FILE);
#if VIDEO_ENABLED
MSWebCam * marielle_webcam=mediastreamer2_tester_get_mire_webcam(ms_factory_get_web_cam_manager(_factory));
#endif
......@@ -225,8 +227,6 @@ void start_adaptive_stream(MSFormatType type, stream_manager_t ** pmarielle, str
disable_plc_on_audio_stream(margaux->audio_stream);
disable_plc_on_audio_stream(marielle->audio_stream);
}
char* recorded_file = NULL;
char* file = bc_tester_res(HELLO_16K_1S_FILE);
if (!disable_plc ){
recorded_file = bc_tester_file(RECORDED_16K_1S_FILE);
}
......@@ -409,11 +409,11 @@ off_t fsize(const char *filename) {
}
static void loss_rate_estimation_bv16(void){
bool_t supported = ms_factory_codec_supported(_factory, "bv16");
int plc_disabled=0 ;
int size_with_plc = 0, size_no_plc= 0;
int result;
rtp_profile_set_payload(&rtp_profile,BV16_PAYLOAD_TYPE,&payload_type_bv16);
if( supported ) {
LossRateEstimatorCtx ctx;
......@@ -437,15 +437,12 @@ static void loss_rate_estimation_bv16(void){
/*file without plc must be approx 15% smaller in size than with plc */
size_with_plc= fsize(bc_tester_file(RECORDED_16K_1S_FILE));
size_no_plc = fsize(bc_tester_file(RECORDED_16K_1S_NO_PLC_FILE));
int result = (size_with_plc*loss_rate/100 + size_no_plc) ;
result = (size_with_plc*loss_rate/100 + size_no_plc) ;
BC_ASSERT_TRUE(result >= size_with_plc);
ms_message("%d %d %d ", size_no_plc, size_with_plc, result);
}
}
static void loss_rate_estimation(void) {
......
......@@ -89,8 +89,11 @@ static void dtmfgen_tonedet(void) {
/*fileplay awt to TRUE: uses soundwrite instaed of voidsink so we can hear what;s going on */
static void dtmfgen_enc_dec_tonedet(char *mime, int sample_rate, int nchannels, bool_t fileplay) {
MSConnectionHelper h;
unsigned int filter_mask ;
bool_t send_silence = TRUE;
MSSndCardManager *scm = ms_factory_get_snd_card_manager(factory);
ms_factory_reset_statistics(scm->factory);
if (!fileplay){
filter_mask= FILTER_MASK_VOIDSOURCE | FILTER_MASK_DTMFGEN | FILTER_MASK_ENCODER
| FILTER_MASK_DECODER | FILTER_MASK_TONEDET | FILTER_MASK_VOIDSINK;
......@@ -100,11 +103,7 @@ static void dtmfgen_enc_dec_tonedet(char *mime, int sample_rate, int nchannels,
| FILTER_MASK_DECODER | FILTER_MASK_TONEDET | FILTER_MASK_SOUNDWRITE;
}
bool_t send_silence = TRUE;
MSSndCardManager *scm = ms_factory_get_snd_card_manager(factory);
ms_factory_reset_statistics(scm->factory);
//ms_filter_reset_statistics();
ms_tester_create_ticker();
ms_tester_codec_mime = mime;
......@@ -169,6 +168,7 @@ static void dtmfgen_enc_dec_tonedet(char *mime, int sample_rate, int nchannels,
}
#if 0
#define SOUNDREAD_FILE_NAME "soundread_filetest.raw"
static void dtmfgen_enc_dec_tonedet_filerec_fileplay(char *mime, int sample_rate, int nchannels) {
......@@ -266,7 +266,7 @@ static void dtmfgen_enc_dec_tonedet_filerec_fileplay(char *mime, int sample_rate
ms_tester_destroy_ticker();
}
#endif
static void dtmfgen_enc_dec_tonedet_pcmu(void) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment