-
- Downloads
conference: identify mixed videos per streamId
Videos in the videoMixer_ were not easy to identify, moreover, "sinkId" in the participants informations was the concatenation of the confId and a URI, which is a problem if several devices from the same account was present in the conference. Finally, the active stream logic was dirty, with two different variables used to identify the active stream in the mixer. This patch introduces a streamId which is (callId_type_idx, e.g. ca111412_video_0, ca111412_audio_2), so every video shown in the conference are identified via a unique ID. Active stream in the video mixer is identified by this ID, not by the callId or pointer. This should not change any behaviour, but prepare for multistream. jami-project#1429 Change-Id: I250dd31ad1ea92ed1fd1e94bec2f5abd311d2128
Showing
- src/client/callmanager.cpp 1 addition, 8 deletionssrc/client/callmanager.cpp
- src/conference.cpp 35 additions, 79 deletionssrc/conference.cpp
- src/conference.h 0 additions, 5 deletionssrc/conference.h
- src/conference_protocol.cpp 1 addition, 3 deletionssrc/conference_protocol.cpp
- src/conference_protocol.h 2 additions, 5 deletionssrc/conference_protocol.h
- src/media/audio/audio_rtp_session.cpp 10 additions, 10 deletionssrc/media/audio/audio_rtp_session.cpp
- src/media/audio/audio_rtp_session.h 1 addition, 1 deletionsrc/media/audio/audio_rtp_session.h
- src/media/audio/audio_sender.cpp 2 additions, 4 deletionssrc/media/audio/audio_sender.cpp
- src/media/audio/audio_sender.h 1 addition, 3 deletionssrc/media/audio/audio_sender.h
- src/media/rtp_session.h 8 additions, 3 deletionssrc/media/rtp_session.h
- src/media/video/video_mixer.cpp 45 additions, 41 deletionssrc/media/video/video_mixer.cpp
- src/media/video/video_mixer.h 33 additions, 18 deletionssrc/media/video/video_mixer.h
- src/media/video/video_rtp_session.cpp 36 additions, 27 deletionssrc/media/video/video_rtp_session.cpp
- src/media/video/video_rtp_session.h 1 addition, 1 deletionsrc/media/video/video_rtp_session.h
- src/sip/sip_utils.cpp 8 additions, 0 deletionssrc/sip/sip_utils.cpp
- src/sip/sip_utils.h 3 additions, 0 deletionssrc/sip/sip_utils.h
- src/sip/sipcall.cpp 34 additions, 13 deletionssrc/sip/sipcall.cpp
- src/sip/sipcall.h 1 addition, 0 deletionssrc/sip/sipcall.h
Loading
Please register or sign in to comment