Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

26d1e199

Commit 26d1e199 authored 11 years ago by Guillaume Roguez

Downloads
- Patches
- Plain Diff

#29564: video: fix non-conference pipeline setup

Note: VideoMixer is not yet ready in this commit.

parent 58f887c8

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/managerimpl.cpp 11 additions, 0 deletions

daemon/src/managerimpl.cpp
daemon/src/video/video_base.h 4 additions, 2 deletions

daemon/src/video/video_base.h
daemon/src/video/video_mixer.cpp 1 addition, 3 deletions

daemon/src/video/video_mixer.cpp
daemon/src/video/video_receive_thread.cpp 49 additions, 24 deletions

daemon/src/video/video_receive_thread.cpp
daemon/src/video/video_receive_thread.h 6 additions, 3 deletions

daemon/src/video/video_receive_thread.h
daemon/src/video/video_rtp_session.cpp 64 additions, 49 deletions

daemon/src/video/video_rtp_session.cpp
daemon/src/video/video_rtp_session.h 3 additions, 2 deletions

daemon/src/video/video_rtp_session.h
daemon/src/video/video_send_thread.cpp 5 additions, 22 deletions

daemon/src/video/video_send_thread.cpp
daemon/src/video/video_send_thread.h 1 addition, 5 deletions

daemon/src/video/video_send_thread.h

with 144 additions and 110 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment