jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview

Browse Source 
Resolved Conflicts:
	daemon/src/account.h
	daemon/src/audio/codecs/celtcodec.cpp
	daemon/src/audio/pulseaudio/pulselayer.cpp
	daemon/src/config/sfl_config.cpp
	daemon/src/config/yamlemitter.cpp
	daemon/src/config/yamlemitter.h
	daemon/src/config/yamlparser.cpp
	daemon/src/main.cpp
	daemon/src/preferences.cpp
	daemon/src/preferences.h
	daemon/src/sip/sdp.cpp
	daemon/src/sip/sdp.h
	daemon/src/sip/sipaccount.cpp
	daemon/src/sip/sipvoiplink.cpp
	daemon/test/audiolayertest.h
	daemon/test/gaincontroltest.cpp
	daemon/test/sdptest.cpp
	gnome/configure.ac
	gnome/src/dbus/dbus.c
This commit is contained in:
Tristan Matthews
2012-04-24 11:59:25 -04:00
parent d47564e88c d3bb0daff7
commit fa4617b222
204 changed files with 7667 additions and 5068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/test/sdptest.cpp
View File

@ -134,6 +134,13 @@ void SDPTest::tearDown()
pj_pool_release(testPool_);
}
void SDPTest::receiveAnswerAfterInitialOffer(const pjmedia_sdp_session* remote)
{
assert(pjmedia_sdp_neg_get_state(session_->negotiator_) == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER);
assert(pjmedia_sdp_neg_set_remote_answer(session_->memPool_, session_->negotiator_, remote) == PJ_SUCCESS);
assert(pjmedia_sdp_neg_get_state(session_->negotiator_) == PJMEDIA_SDP_NEG_STATE_WAIT_NEGO);
}
void SDPTest::testInitialOfferFirstCodec()
{
std::cout << "------------ SDPTest::testInitialOfferFirstCodec --------------" << std::endl;
@ -164,7 +171,7 @@ void SDPTest::testInitialOfferFirstCodec()
pjmedia_sdp_session *remoteAnswer;
pjmedia_sdp_parse(testPool_, (char*) sdp_answer1, strlen(sdp_answer1), &remoteAnswer);
session_->receivingAnswerAfterInitialOffer(remoteAnswer);
receiveAnswerAfterInitialOffer(remoteAnswer);
session_->startNegotiation();
session_->setMediaTransportInfoFromRemoteSdp();
@ -241,7 +248,7 @@ void SDPTest::testInitialOfferLastCodec()
pjmedia_sdp_session *remoteAnswer;
pjmedia_sdp_parse(testPool_, (char*) sdp_answer2, strlen(sdp_answer2), &remoteAnswer);
session_->receivingAnswerAfterInitialOffer(remoteAnswer);
receiveAnswerAfterInitialOffer(remoteAnswer);
session_->startNegotiation();
session_->setMediaTransportInfoFromRemoteSdp();
@ -319,13 +326,14 @@ void SDPTest::testReinvite()
// pjmedia_sdp_parse(testPool_, test[0].offer_answer[0].sdp2, strlen(test[0].offer_answer[0].sdp2), &remoteAnswer);
pjmedia_sdp_parse(testPool_, (char*) sdp_answer1, strlen(sdp_answer1), &remoteAnswer);
session_->receivingAnswerAfterInitialOffer(remoteAnswer);
receiveAnswerAfterInitialOffer(remoteAnswer);
session_->startNegotiation();
session_->setMediaTransportInfoFromRemoteSdp();
CPPUNIT_ASSERT(session_->getLocalIP() == LOCALHOST);
CPPUNIT_ASSERT(session_->getRemoteIP() == "host.example.com");
CPPUNIT_ASSERT(session_->getSessionAudioMedia()->getMimeSubtype() == "PCMU");
pjmedia_sdp_session *reinviteOffer;
pjmedia_sdp_parse(testPool_, (char*) sdp_reinvite, strlen(sdp_reinvite), &reinviteOffer);