-
- Downloads
multistream: make the daemon able to negotiate more than 2 medias
This patch makes the daemon able to negotiate more than 2 medias for a call. Basically, this patch includes some major changes: 1. reportMediaNegotiationStatus is also called for conference, so the client is able to update the mediaList of the conference to use it later if it needs to change the medias. And the medias can be retrieven with currentMediaList 2. The conference object correctly updates the video mixer on media changes, and video inputs are restarted if removed then re-added. 3. Because previous versions of the daemon only supports two medias, only negotiate more medias with compatible peers. If the daemon is not compatible, the medias will not be negotiated anyway. jami-project#1429 Change-Id: I55701d9e6e53b05c9a58adad4e8ea90303e6b9e7
Showing
- bin/dbus/cx.ring.Ring.CallManager.xml 24 additions, 0 deletionsbin/dbus/cx.ring.Ring.CallManager.xml
- bin/dbus/dbuscallmanager.cpp 7 additions, 1 deletionbin/dbus/dbuscallmanager.cpp
- bin/dbus/dbuscallmanager.h 3 additions, 0 deletionsbin/dbus/dbuscallmanager.h
- bin/jni/callmanager.i 1 addition, 0 deletionsbin/jni/callmanager.i
- bin/nodejs/callmanager.i 1 addition, 0 deletionsbin/nodejs/callmanager.i
- src/call.h 18 additions, 3 deletionssrc/call.h
- src/client/callmanager.cpp 17 additions, 3 deletionssrc/client/callmanager.cpp
- src/conference.cpp 54 additions, 42 deletionssrc/conference.cpp
- src/conference.h 12 additions, 1 deletionsrc/conference.h
- src/jami/callmanager_interface.h 2 additions, 0 deletionssrc/jami/callmanager_interface.h
- src/media/video/video_input.cpp 7 additions, 3 deletionssrc/media/video/video_input.cpp
- src/media/video/video_input.h 7 additions, 0 deletionssrc/media/video/video_input.h
- src/media/video/video_mixer.cpp 46 additions, 41 deletionssrc/media/video/video_mixer.cpp
- src/media/video/video_mixer.h 0 additions, 6 deletionssrc/media/video/video_mixer.h
- src/sip/sdp.cpp 6 additions, 1 deletionsrc/sip/sdp.cpp
- src/sip/sdp.h 1 addition, 1 deletionsrc/sip/sdp.h
- src/sip/sip_utils.cpp 3 additions, 3 deletionssrc/sip/sip_utils.cpp
- src/sip/sip_utils.h 6 additions, 3 deletionssrc/sip/sip_utils.h
- src/sip/sipaccountbase.cpp 14 additions, 4 deletionssrc/sip/sipaccountbase.cpp
- src/sip/sipcall.cpp 83 additions, 14 deletionssrc/sip/sipcall.cpp
Loading
Please register or sign in to comment