Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qgroundcontrol
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

76b58cbc

Unverified Commit 76b58cbc authored 4 years ago by Don Gagne Committed by GitHub 4 years ago

Downloads
- Plain Diff

Merge pull request #9007 from DonLakeFlyer/VideoStreaming

Video Streaming: Camera ui allows switch to photo mode to capture individual images from stream

parents a688855e 138d683a

Branches

No related tags found

Loading

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog.md 1 addition, 0 deletions

ChangeLog.md
src/Camera/QGCCameraControl.cc 1 addition, 4 deletions

src/Camera/QGCCameraControl.cc
src/FlightMap/Widgets/PhotoVideoControl.qml 180 additions, 136 deletions

src/FlightMap/Widgets/PhotoVideoControl.qml
src/Settings/AppSettings.cc 18 additions, 6 deletions

src/Settings/AppSettings.cc
src/Settings/AppSettings.h 3 additions, 0 deletions

src/Settings/AppSettings.h
src/VideoManager/VideoManager.cc 6 additions, 1 deletion

src/VideoManager/VideoManager.cc
src/VideoManager/VideoManager.h 1 addition, 1 deletion

src/VideoManager/VideoManager.h

with 210 additions and 148 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