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

7d3cb138

Commit 7d3cb138 authored 9 years ago by Gus Grubba

Downloads
- Plain Diff

Merge pull request #2133 from dogmaphobic/videoWork

Detect video stream.

parents 2583e66a 3a37fd25

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/FlightDisplay/FlightDisplayView.qml 0 additions, 4 deletions

src/FlightDisplay/FlightDisplayView.qml
src/FlightDisplay/FlightDisplayViewController.cc 33 additions, 0 deletions

src/FlightDisplay/FlightDisplayViewController.cc
src/FlightDisplay/FlightDisplayViewController.h 15 additions, 0 deletions

src/FlightDisplay/FlightDisplayViewController.h
src/FlightDisplay/FlightDisplayViewVideo.qml 33 additions, 17 deletions

src/FlightDisplay/FlightDisplayViewVideo.qml
src/FlightMap/QGCVideoBackground.qml 4 additions, 3 deletions

src/FlightMap/QGCVideoBackground.qml
src/VideoStreaming/VideoSurface.cc 2 additions, 0 deletions

src/VideoStreaming/VideoSurface.cc
src/VideoStreaming/VideoSurface.h 3 additions, 0 deletions

src/VideoStreaming/VideoSurface.h

with 90 additions and 24 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