From 0ca6aedeca4b693d39aaf6fa48aef62e63f4cb49 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 4 Feb 2014 11:01:25 +0100 Subject: [PATCH] change telephone-event supported codes --- coreapi/linphonecore.c | 2 +- tester/call_tester.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index e00ada56d..3ca34e0ba 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1261,7 +1261,7 @@ static void linphone_core_init (LinphoneCore * lc, const LinphoneCoreVTable *vta linphone_core_assign_payload_type(lc,&payload_type_speex_nb,110,"vbr=on"); linphone_core_assign_payload_type(lc,&payload_type_speex_wb,111,"vbr=on"); linphone_core_assign_payload_type(lc,&payload_type_speex_uwb,112,"vbr=on"); - linphone_core_assign_payload_type(lc,&payload_type_telephone_event,101,"0-11"); + linphone_core_assign_payload_type(lc,&payload_type_telephone_event,101,"0-15"); linphone_core_assign_payload_type(lc,&payload_type_g722,9,NULL); #if defined(ANDROID) || defined (__IPHONE_OS_VERSION_MIN_REQUIRED) diff --git a/tester/call_tester.c b/tester/call_tester.c index 0333df962..f0fd07461 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -1033,11 +1033,19 @@ static void early_media_call(void) { CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallIncomingEarlyMedia,1); CU_ASSERT_EQUAL(pauline->stat.number_of_LinphoneCallOutgoingEarlyMedia,1); + + wait_for_until(pauline->lc,marie->lc,NULL,0,1000); + + /*added because a bug related to early-media caused the Connected state to be reached two times*/ + CU_ASSERT_EQUAL(marie->stat.number_of_LinphoneCallConnected,1); + /*just to sleep*/ linphone_core_terminate_all_calls(marie->lc); CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&pauline->stat.number_of_LinphoneCallEnd,1)); CU_ASSERT_TRUE(wait_for(pauline->lc,marie->lc,&marie->stat.number_of_LinphoneCallEnd,1)); + + linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); }