Gus Grubba
9 years ago
committed by
GitHub
14 changed files with 329 additions and 168 deletions
@ -1,94 +0,0 @@ |
|||||||
/****************************************************************************
|
|
||||||
* |
|
||||||
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
|
|
||||||
* |
|
||||||
* QGroundControl is licensed according to the terms in the file |
|
||||||
* COPYING.md in the root of the source code directory. |
|
||||||
* |
|
||||||
****************************************************************************/ |
|
||||||
|
|
||||||
|
|
||||||
#include <QQmlContext> |
|
||||||
#include <QQmlEngine> |
|
||||||
#include <QSettings> |
|
||||||
|
|
||||||
#include <VideoItem.h> |
|
||||||
|
|
||||||
#include "ScreenToolsController.h" |
|
||||||
#include "FlightDisplayViewController.h" |
|
||||||
|
|
||||||
const char* kMainFlightDisplayViewControllerGroup = "FlightDisplayViewController"; |
|
||||||
|
|
||||||
FlightDisplayViewController::FlightDisplayViewController(QObject *parent) |
|
||||||
: QObject(parent) |
|
||||||
, _videoRunning(false) |
|
||||||
{ |
|
||||||
/*
|
|
||||||
* This is the receiving end of an UDP RTP stream. The sender can be setup with this command: |
|
||||||
* |
|
||||||
* gst-launch-1.0 uvch264src initial-bitrate=1000000 average-bitrate=1000000 iframe-period=1000 name=src auto-start=true src.vidsrc ! \
|
|
||||||
* video/x-h264,width=1280,height=720,framerate=24/1 ! h264parse ! rtph264pay ! udpsink host=192.168.1.9 port=5600 |
|
||||||
* |
|
||||||
* Where the main parameters are: |
|
||||||
* |
|
||||||
* uvch264src: Your h264 video source (the example above uses a Logitech C920 on an Raspberry PI 2+ or Odroid C1 |
|
||||||
* host=192.168.1.9 This is the IP address of QGC. You can use Avahi/Zeroconf to find QGC using the "_qgroundcontrol._udp" service. |
|
||||||
* |
|
||||||
* Advanced settings (you should probably read the gstreamer documentation before changing these): |
|
||||||
* |
|
||||||
* initial-bitrate=1000000 average-bitrate=1000000 |
|
||||||
* The bit rate to use. The greater, the better quality at the cost of higher bandwidth. |
|
||||||
* |
|
||||||
* width=1280,height=720,framerate=24/1 |
|
||||||
* The video resolution and frame rate. This depends on the camera used. |
|
||||||
* |
|
||||||
* iframe-period=1000 |
|
||||||
* Interval between iFrames. The greater the interval the lesser bandwidth at the cost of a longer time to recover from lost packets. |
|
||||||
* |
|
||||||
* Do not change anything else unless you know what you are doing. Any other change will require a matching change on the receiving end. |
|
||||||
* |
|
||||||
*/ |
|
||||||
_videoSurface = new VideoSurface; |
|
||||||
_videoReceiver = new VideoReceiver(this); |
|
||||||
_videoReceiver->setUri(QLatin1Literal("udp://0.0.0.0:5600")); // Port 5600=Solo UDP port, if you change you will break Solo video support
|
|
||||||
#if defined(QGC_GST_STREAMING) |
|
||||||
_videoReceiver->setVideoSink(_videoSurface->videoSink()); |
|
||||||
connect(&_frameTimer, &QTimer::timeout, this, &FlightDisplayViewController::_updateTimer); |
|
||||||
_frameTimer.start(1000); |
|
||||||
#endif |
|
||||||
} |
|
||||||
|
|
||||||
FlightDisplayViewController::~FlightDisplayViewController() |
|
||||||
{ |
|
||||||
|
|
||||||
} |
|
||||||
|
|
||||||
#if defined(QGC_GST_STREAMING) |
|
||||||
void FlightDisplayViewController::_updateTimer(void) |
|
||||||
{ |
|
||||||
if(_videoRunning) |
|
||||||
{ |
|
||||||
time_t elapsed = 0; |
|
||||||
if(_videoSurface) |
|
||||||
{ |
|
||||||
elapsed = time(0) - _videoSurface->lastFrame(); |
|
||||||
} |
|
||||||
if(elapsed > 2) |
|
||||||
{ |
|
||||||
_videoRunning = false; |
|
||||||
_videoSurface->setLastFrame(0); |
|
||||||
emit videoRunningChanged(); |
|
||||||
} |
|
||||||
} |
|
||||||
else |
|
||||||
{ |
|
||||||
if(_videoSurface && _videoSurface->lastFrame()) { |
|
||||||
if(!_videoRunning) |
|
||||||
{ |
|
||||||
_videoRunning = true; |
|
||||||
emit videoRunningChanged(); |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
#endif |
|
||||||
@ -1,58 +0,0 @@ |
|||||||
/****************************************************************************
|
|
||||||
* |
|
||||||
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
|
|
||||||
* |
|
||||||
* QGroundControl is licensed according to the terms in the file |
|
||||||
* COPYING.md in the root of the source code directory. |
|
||||||
* |
|
||||||
****************************************************************************/ |
|
||||||
|
|
||||||
|
|
||||||
#ifndef FlightDisplayViewController_H |
|
||||||
#define FlightDisplayViewController_H |
|
||||||
|
|
||||||
#include <QObject> |
|
||||||
#include <QTimer> |
|
||||||
|
|
||||||
#include "VideoSurface.h" |
|
||||||
#include "VideoReceiver.h" |
|
||||||
|
|
||||||
class FlightDisplayViewController : public QObject |
|
||||||
{ |
|
||||||
Q_OBJECT |
|
||||||
|
|
||||||
public: |
|
||||||
FlightDisplayViewController(QObject* parent = NULL); |
|
||||||
~FlightDisplayViewController(); |
|
||||||
|
|
||||||
Q_PROPERTY(bool hasVideo READ hasVideo CONSTANT) |
|
||||||
|
|
||||||
Q_PROPERTY(VideoSurface* videoSurface MEMBER _videoSurface CONSTANT); |
|
||||||
Q_PROPERTY(VideoReceiver* videoReceiver MEMBER _videoReceiver CONSTANT); |
|
||||||
|
|
||||||
Q_PROPERTY(bool videoRunning READ videoRunning NOTIFY videoRunningChanged) |
|
||||||
|
|
||||||
#if defined(QGC_GST_STREAMING) |
|
||||||
bool hasVideo () { return true; } |
|
||||||
#else |
|
||||||
bool hasVideo () { return false; } |
|
||||||
#endif |
|
||||||
|
|
||||||
bool videoRunning() { return _videoRunning; } |
|
||||||
|
|
||||||
signals: |
|
||||||
void videoRunningChanged(); |
|
||||||
|
|
||||||
private: |
|
||||||
void _updateTimer(void); |
|
||||||
|
|
||||||
private: |
|
||||||
VideoSurface* _videoSurface; |
|
||||||
VideoReceiver* _videoReceiver; |
|
||||||
bool _videoRunning; |
|
||||||
#if defined(QGC_GST_STREAMING) |
|
||||||
QTimer _frameTimer; |
|
||||||
#endif |
|
||||||
}; |
|
||||||
|
|
||||||
#endif |
|
||||||
@ -0,0 +1,171 @@ |
|||||||
|
/****************************************************************************
|
||||||
|
* |
||||||
|
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
|
||||||
|
* |
||||||
|
* QGroundControl is licensed according to the terms in the file |
||||||
|
* COPYING.md in the root of the source code directory. |
||||||
|
* |
||||||
|
****************************************************************************/ |
||||||
|
|
||||||
|
|
||||||
|
#include <QQmlContext> |
||||||
|
#include <QQmlEngine> |
||||||
|
#include <QSettings> |
||||||
|
#include <QCameraInfo> |
||||||
|
|
||||||
|
#include <VideoItem.h> |
||||||
|
|
||||||
|
#include "ScreenToolsController.h" |
||||||
|
#include "VideoManager.h" |
||||||
|
|
||||||
|
static const char* kVideoSourceKey = "VideoSource"; |
||||||
|
static const char* kGStreamerSource = "UDP Video Stream"; |
||||||
|
|
||||||
|
QGC_LOGGING_CATEGORY(VideoManagerLog, "VideoManagerLog") |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
VideoManager::VideoManager(QGCApplication* app) |
||||||
|
: QGCTool(app) |
||||||
|
, _videoRunning(false) |
||||||
|
{ |
||||||
|
/*
|
||||||
|
* This is the receiving end of an UDP RTP stream. The sender can be setup with this command: |
||||||
|
* |
||||||
|
* gst-launch-1.0 uvch264src initial-bitrate=1000000 average-bitrate=1000000 iframe-period=1000 name=src auto-start=true src.vidsrc ! \
|
||||||
|
* video/x-h264,width=1280,height=720,framerate=24/1 ! h264parse ! rtph264pay ! udpsink host=192.168.1.9 port=5600 |
||||||
|
* |
||||||
|
* Where the main parameters are: |
||||||
|
* |
||||||
|
* uvch264src: Your h264 video source (the example above uses a Logitech C920 on an Raspberry PI 2+ or Odroid C1 |
||||||
|
* host=192.168.1.9 This is the IP address of QGC. You can use Avahi/Zeroconf to find QGC using the "_qgroundcontrol._udp" service. |
||||||
|
* |
||||||
|
* Advanced settings (you should probably read the gstreamer documentation before changing these): |
||||||
|
* |
||||||
|
* initial-bitrate=1000000 average-bitrate=1000000 |
||||||
|
* The bit rate to use. The greater, the better quality at the cost of higher bandwidth. |
||||||
|
* |
||||||
|
* width=1280,height=720,framerate=24/1 |
||||||
|
* The video resolution and frame rate. This depends on the camera used. |
||||||
|
* |
||||||
|
* iframe-period=1000 |
||||||
|
* Interval between iFrames. The greater the interval the lesser bandwidth at the cost of a longer time to recover from lost packets. |
||||||
|
* |
||||||
|
* Do not change anything else unless you know what you are doing. Any other change will require a matching change on the receiving end. |
||||||
|
* |
||||||
|
*/ |
||||||
|
_videoSurface = new VideoSurface; |
||||||
|
_videoReceiver = new VideoReceiver(this); |
||||||
|
_videoReceiver->setUri(QLatin1Literal("udp://0.0.0.0:5600")); // Port 5600=Solo UDP port, if you change it, you will break Solo video support
|
||||||
|
#if defined(QGC_GST_STREAMING) |
||||||
|
_videoReceiver->setVideoSink(_videoSurface->videoSink()); |
||||||
|
connect(&_frameTimer, &QTimer::timeout, this, &VideoManager::_updateTimer); |
||||||
|
_frameTimer.start(1000); |
||||||
|
#endif |
||||||
|
//-- Get saved video source
|
||||||
|
QSettings settings; |
||||||
|
setVideoSource(settings.value(kVideoSourceKey, kGStreamerSource).toString()); |
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
VideoManager::~VideoManager() |
||||||
|
{ |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
void |
||||||
|
VideoManager::setToolbox(QGCToolbox *toolbox) |
||||||
|
{ |
||||||
|
QGCTool::setToolbox(toolbox); |
||||||
|
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); |
||||||
|
qmlRegisterUncreatableType<VideoManager>("QGroundControl.VideoManager", 1, 0, "VideoManager", "Reference only"); |
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
bool |
||||||
|
VideoManager::hasVideo() |
||||||
|
{ |
||||||
|
#if defined(QGC_GST_STREAMING) |
||||||
|
return true; |
||||||
|
#endif |
||||||
|
return !_videoSource.isEmpty(); |
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
bool |
||||||
|
VideoManager::isGStreamer() |
||||||
|
{ |
||||||
|
#if defined(QGC_GST_STREAMING) |
||||||
|
return _videoSource == kGStreamerSource; |
||||||
|
#else |
||||||
|
return false; |
||||||
|
#endif |
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
void |
||||||
|
VideoManager::setVideoSource(QString vSource) |
||||||
|
{ |
||||||
|
_videoSource = vSource; |
||||||
|
QSettings settings; |
||||||
|
settings.setValue(kVideoSourceKey, vSource); |
||||||
|
emit videoSourceChanged(); |
||||||
|
QList<QCameraInfo> cameras = QCameraInfo::availableCameras(); |
||||||
|
foreach (const QCameraInfo &cameraInfo, cameras) { |
||||||
|
if(cameraInfo.description() == vSource) { |
||||||
|
_videoSourceID = cameraInfo.deviceName(); |
||||||
|
emit videoSourceIDChanged(); |
||||||
|
qCDebug(VideoManagerLog) << "Found USB source:" << _videoSourceID << " Name:" << _videoSource; |
||||||
|
break; |
||||||
|
} |
||||||
|
} |
||||||
|
emit isGStreamerChanged(); |
||||||
|
qCDebug(VideoManagerLog) << "New Video Source:" << vSource; |
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
QStringList |
||||||
|
VideoManager::videoSourceList() |
||||||
|
{ |
||||||
|
_videoSourceList.clear(); |
||||||
|
#if defined(QGC_GST_STREAMING) |
||||||
|
_videoSourceList.append(kGStreamerSource); |
||||||
|
#endif |
||||||
|
QList<QCameraInfo> cameras = QCameraInfo::availableCameras(); |
||||||
|
foreach (const QCameraInfo &cameraInfo, cameras) { |
||||||
|
qCDebug(VideoManagerLog) << "UVC Video source ID:" << cameraInfo.deviceName() << " Name:" << cameraInfo.description(); |
||||||
|
_videoSourceList.append(cameraInfo.description()); |
||||||
|
} |
||||||
|
return _videoSourceList; |
||||||
|
} |
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
#if defined(QGC_GST_STREAMING) |
||||||
|
void VideoManager::_updateTimer(void) |
||||||
|
{ |
||||||
|
if(_videoRunning) |
||||||
|
{ |
||||||
|
time_t elapsed = 0; |
||||||
|
if(_videoSurface) |
||||||
|
{ |
||||||
|
elapsed = time(0) - _videoSurface->lastFrame(); |
||||||
|
} |
||||||
|
if(elapsed > 2) |
||||||
|
{ |
||||||
|
_videoRunning = false; |
||||||
|
_videoSurface->setLastFrame(0); |
||||||
|
emit videoRunningChanged(); |
||||||
|
} |
||||||
|
} |
||||||
|
else |
||||||
|
{ |
||||||
|
if(_videoSurface && _videoSurface->lastFrame()) { |
||||||
|
if(!_videoRunning) |
||||||
|
{ |
||||||
|
_videoRunning = true; |
||||||
|
emit videoRunningChanged(); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
#endif |
||||||
@ -0,0 +1,75 @@ |
|||||||
|
/****************************************************************************
|
||||||
|
* |
||||||
|
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
|
||||||
|
* |
||||||
|
* QGroundControl is licensed according to the terms in the file |
||||||
|
* COPYING.md in the root of the source code directory. |
||||||
|
* |
||||||
|
****************************************************************************/ |
||||||
|
|
||||||
|
|
||||||
|
#ifndef VideoManager_H |
||||||
|
#define VideoManager_H |
||||||
|
|
||||||
|
#include <QObject> |
||||||
|
#include <QTimer> |
||||||
|
|
||||||
|
#include "QGCLoggingCategory.h" |
||||||
|
#include "VideoSurface.h" |
||||||
|
#include "VideoReceiver.h" |
||||||
|
#include "QGCToolbox.h" |
||||||
|
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(VideoManagerLog) |
||||||
|
|
||||||
|
class VideoManager : public QGCTool |
||||||
|
{ |
||||||
|
Q_OBJECT |
||||||
|
|
||||||
|
public: |
||||||
|
VideoManager (QGCApplication* app); |
||||||
|
~VideoManager (); |
||||||
|
|
||||||
|
Q_PROPERTY(bool hasVideo READ hasVideo NOTIFY hasVideoChanged) |
||||||
|
Q_PROPERTY(bool isGStreamer READ isGStreamer NOTIFY isGStreamerChanged) |
||||||
|
Q_PROPERTY(QString videoSourceID READ videoSource NOTIFY videoSourceIDChanged) |
||||||
|
Q_PROPERTY(QString videoSource READ videoSource WRITE setVideoSource NOTIFY videoSourceChanged) |
||||||
|
Q_PROPERTY(QStringList videoSourceList READ videoSourceList NOTIFY videoSourceListChanged) |
||||||
|
Q_PROPERTY(bool videoRunning READ videoRunning NOTIFY videoRunningChanged) |
||||||
|
Q_PROPERTY(VideoSurface* videoSurface MEMBER _videoSurface CONSTANT) |
||||||
|
Q_PROPERTY(VideoReceiver* videoReceiver MEMBER _videoReceiver CONSTANT) |
||||||
|
|
||||||
|
bool hasVideo (); |
||||||
|
bool isGStreamer (); |
||||||
|
bool videoRunning () { return _videoRunning; } |
||||||
|
QString videoSourceID () { return _videoSourceID; } |
||||||
|
QString videoSource () { return _videoSource; } |
||||||
|
QStringList videoSourceList (); |
||||||
|
void setVideoSource (QString vSource); |
||||||
|
|
||||||
|
// Override from QGCTool
|
||||||
|
void setToolbox (QGCToolbox *toolbox); |
||||||
|
|
||||||
|
signals: |
||||||
|
void hasVideoChanged (); |
||||||
|
void videoRunningChanged (); |
||||||
|
void videoSourceChanged (); |
||||||
|
void videoSourceListChanged (); |
||||||
|
void isGStreamerChanged (); |
||||||
|
void videoSourceIDChanged (); |
||||||
|
|
||||||
|
private: |
||||||
|
void _updateTimer(void); |
||||||
|
|
||||||
|
private: |
||||||
|
VideoSurface* _videoSurface; |
||||||
|
VideoReceiver* _videoReceiver; |
||||||
|
bool _videoRunning; |
||||||
|
#if defined(QGC_GST_STREAMING) |
||||||
|
QTimer _frameTimer; |
||||||
|
#endif |
||||||
|
QString _videoSource; |
||||||
|
QString _videoSourceID; |
||||||
|
QStringList _videoSourceList; |
||||||
|
}; |
||||||
|
|
||||||
|
#endif |
||||||
Loading…
Reference in new issue