Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
b2fe913c
Commit
b2fe913c
authored
Dec 16, 2019
by
Andrew Voznytsa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement GLVideoItem stub for no-gstreamer builds
parent
bb763854
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
48 additions
and
14 deletions
+48
-14
qgroundcontrol.pro
qgroundcontrol.pro
+0
-7
GLVideoItemStub.cc
src/VideoStreaming/GLVideoItemStub.cc
+16
-0
GLVideoItemStub.h
src/VideoStreaming/GLVideoItemStub.h
+18
-0
VideoStreaming.cc
src/VideoStreaming/VideoStreaming.cc
+7
-4
VideoStreaming.h
src/VideoStreaming/VideoStreaming.h
+0
-2
VideoStreaming.pri
src/VideoStreaming/VideoStreaming.pri
+7
-1
No files found.
qgroundcontrol.pro
View file @
b2fe913c
...
...
@@ -331,13 +331,6 @@ contains (DEFINES, QGC_DISABLE_PAIRING) {
DEFINES
+=
QGC_ENABLE_PAIRING
}
#
#
Add
qmlglsink
(
libs
/
gst
-
plugins
-
good
/
ext
/
qt
)
#
include
(
qmlglsink
.
pri
)
#
#
External
library
configuration
#
...
...
src/VideoStreaming/GLVideoItemStub.cc
0 → 100644
View file @
b2fe913c
#include "GLVideoItemStub.h"
GLVideoItemStub
::
GLVideoItemStub
()
{
// setFlag(QQuickItem::ItemHasContents, true);
}
GLVideoItemStub
::~
GLVideoItemStub
()
{
}
//QSGNode*
//GLVideoItemStub::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData)
//{
// return oldNode;
//}
src/VideoStreaming/GLVideoItemStub.h
0 → 100644
View file @
b2fe913c
#pragma once
#include <QtQuick/QQuickItem>
class
GLVideoItemStub
:
public
QQuickItem
{
Q_OBJECT
public:
GLVideoItemStub
();
~
GLVideoItemStub
();
protected:
// QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData);
private:
};
src/VideoStreaming/VideoStreaming.cc
View file @
b2fe913c
...
...
@@ -25,6 +25,8 @@
#if defined(__ios__)
#include "gst_ios_init.h"
#endif
#else
#include "GLVideoItemStub.h"
#endif
#include "VideoStreaming.h"
...
...
@@ -183,9 +185,10 @@ void initializeVideoStreaming(int &argc, char* argv[], char* logpath, char* debu
qCritical
()
<<
"unable to find qmlglsink - you need to build it yourself and add to GST_PLUGIN_PATH"
;
}
#else
Q_UNUSED
(
argc
);
Q_UNUSED
(
argv
);
Q_UNUSED
(
logpath
);
Q_UNUSED
(
debuglevel
);
qmlRegisterType
<
GLVideoItemStub
>
(
"org.freedesktop.gstreamer.GLVideoItem"
,
1
,
0
,
"GstGLVideoItem"
);
Q_UNUSED
(
argc
)
Q_UNUSED
(
argv
)
Q_UNUSED
(
logpath
)
Q_UNUSED
(
debuglevel
)
#endif
}
src/VideoStreaming/VideoStreaming.h
View file @
b2fe913c
...
...
@@ -17,5 +17,3 @@
#pragma once
extern
void
initializeVideoStreaming
(
int
&
argc
,
char
*
argv
[],
char
*
filename
,
char
*
debuglevel
);
src/VideoStreaming/VideoStreaming.pri
View file @
b2fe913c
...
...
@@ -126,6 +126,7 @@ VideoEnabled {
$$PWD/iOS
}
include($$PWD/../../qmlglsink.pri)
} else {
LinuxBuild|MacBuild|iOSBuild|WindowsBuild|AndroidBuild {
message("Skipping support for video streaming (GStreamer libraries not installed)")
...
...
@@ -133,5 +134,10 @@ VideoEnabled {
} else {
message("Skipping support for video streaming (Unsupported platform)")
}
}
SOURCES += \
$$PWD/GLVideoItemStub.cc
HEADERS += \
$$PWD/GLVideoItemStub.h
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment