Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

ftl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

7ac88821

Commit 7ac88821 authored 5 years ago by Nicolas Pope

Downloads
- Plain Diff

Merge branch 'feature/50/sync' into 'master'

Resolves #50 stream sync

Closes #50

See merge request nicolas.pope/ftl!67

parents d0ac179e b6654659

No related branches found

No related tags found

1 merge request!67Resolves #50 stream sync

Pipeline #12288 passed 5 years ago

Stage: all

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

applications/reconstruct/src/main.cpp 3 additions, 2 deletions

applications/reconstruct/src/main.cpp
components/net/cpp/src/peer.cpp 6 additions, 4 deletions

components/net/cpp/src/peer.cpp
components/rgbd-sources/include/ftl/rgbd/detail/source.hpp 2 additions, 1 deletion

components/rgbd-sources/include/ftl/rgbd/detail/source.hpp
components/rgbd-sources/include/ftl/rgbd/source.hpp 3 additions, 0 deletions

components/rgbd-sources/include/ftl/rgbd/source.hpp
components/rgbd-sources/include/ftl/rgbd/streamer.hpp 4 additions, 0 deletions

components/rgbd-sources/include/ftl/rgbd/streamer.hpp
components/rgbd-sources/src/net.cpp 29 additions, 5 deletions

components/rgbd-sources/src/net.cpp
components/rgbd-sources/src/net.hpp 6 additions, 1 deletion

components/rgbd-sources/src/net.hpp
components/rgbd-sources/src/source.cpp 18 additions, 6 deletions

components/rgbd-sources/src/source.cpp
components/rgbd-sources/src/stereovideo.cpp 3 additions, 3 deletions

components/rgbd-sources/src/stereovideo.cpp
components/rgbd-sources/src/streamer.cpp 80 additions, 18 deletions

components/rgbd-sources/src/streamer.cpp

with 154 additions and 40 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