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
f882a833
Commit
f882a833
authored
Jul 06, 2015
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows build
parent
db5708e6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
25 deletions
+23
-25
VideoReceiver.cc
src/VideoStreaming/VideoReceiver.cc
+1
-1
VideoStreaming.pri
src/VideoStreaming/VideoStreaming.pri
+11
-16
gstqtvideosinkmarshal.c
src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.c
+3
-0
openglsurfacepainter.cpp
...treaming/gstqtvideosink/painters/openglsurfacepainter.cpp
+4
-4
videomaterial.cpp
src/VideoStreaming/gstqtvideosink/painters/videomaterial.cpp
+4
-4
No files found.
src/VideoStreaming/VideoReceiver.cc
View file @
f882a833
...
...
@@ -114,7 +114,7 @@ void VideoReceiver::start()
gst_bin_add_many
(
GST_BIN
(
_pipeline
),
dataSource
,
demux
,
parser
,
decoder
,
_videoSink
,
NULL
);
if
(
gst_element_link_many
(
dataSource
,
demux
,
parser
,
decoder
,
_videoSink
,
NULL
)
!=
TRUE
)
{
if
(
gst_element_link_many
(
dataSource
,
demux
,
parser
,
decoder
,
_videoSink
,
NULL
)
!=
(
gboolean
)
TRUE
)
{
break
;
}
...
...
src/VideoStreaming/VideoStreaming.pri
View file @
f882a833
...
...
@@ -51,22 +51,17 @@ LinuxBuild {
}
} else:WindowsBuild {
#- gstreamer installed by default under c:/gstreamer
# This is not working. It builds but at runtime, it expects to find
# the gstreamer DLLs, even though it is, in theory, linking to it
# statically.
exists(foobar_removethistobuild) {
GST_ROOT = c:/gstreamer/1.0/x86
exists($$GST_ROOT) {
message("Including support for video streaming")
CONFIG += VideoEnabled
LIBS += -L$$GST_ROOT/lib/gstreamer-1.0/static -lgstreamer-1.0 -lgstvideo-1.0 -lgstbase-1.0
LIBS += -L$$GST_ROOT/lib -lglib-2.0 -lintl -lgobject-2.0
INCLUDEPATH += \
$$GST_ROOT/include/gstreamer-1.0 \
$$GST_ROOT/include/glib-2.0 \
$$GST_ROOT/lib/gstreamer-1.0\include \
$$GST_ROOT/lib/glib-2.0/include
}
GST_ROOT = c:/gstreamer/1.0/x86
exists($$GST_ROOT) {
message("Including support for video streaming")
CONFIG += VideoEnabled
LIBS += -L$$GST_ROOT/lib/gstreamer-1.0/static -lgstreamer-1.0 -lgstvideo-1.0 -lgstbase-1.0
LIBS += -L$$GST_ROOT/lib -lglib-2.0 -lintl -lgobject-2.0
INCLUDEPATH += \
$$GST_ROOT/include/gstreamer-1.0 \
$$GST_ROOT/include/glib-2.0 \
$$GST_ROOT/lib/gstreamer-1.0\include \
$$GST_ROOT/lib/glib-2.0/include
}
}
...
...
src/VideoStreaming/gstqtvideosink/gstqtvideosinkmarshal.c
View file @
f882a833
#include <glib-object.h>
#if defined(_MSC_VER)
#pragma warning(disable: 4100)
#endif
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
...
...
src/VideoStreaming/gstqtvideosink/painters/openglsurfacepainter.cpp
View file @
f882a833
...
...
@@ -163,10 +163,10 @@ void OpenGLSurfacePainter::updateColors(int brightness, int contrast, int hue, i
*/
case
GST_VIDEO_COLOR_MATRIX_BT601
:
m_colorMatrix
*=
QMatrix4x4
(
1.164
,
0.000
,
1.596
,
-
0.8708
,
1.164
,
-
0.392
,
-
0.813
,
0.5296
,
1.164
,
2.017
,
0.000
,
-
1.081
,
0.0
,
0.000
,
0.000
,
1.0000
);
1.164
f
,
0.000
f
,
1.596
f
,
-
0.8708
f
,
1.164
f
,
-
0.392
f
,
-
0.813
f
,
0.5296
f
,
1.164
f
,
2.017
f
,
0.000
f
,
-
1.081
f
,
0.0
f
,
0.000
f
,
0.000
f
,
1.0000
f
);
break
;
default:
break
;
...
...
src/VideoStreaming/gstqtvideosink/painters/videomaterial.cpp
View file @
f882a833
...
...
@@ -399,10 +399,10 @@ void VideoMaterial::updateColors(int brightness, int contrast, int hue, int satu
*/
case
GST_VIDEO_COLOR_MATRIX_BT601
:
m_colorMatrix
*=
QMatrix4x4
(
1.164
,
0.000
,
1.596
,
-
0.8708
,
1.164
,
-
0.392
,
-
0.813
,
0.5296
,
1.164
,
2.017
,
0.000
,
-
1.081
,
0.0
,
0.000
,
0.000
,
1.0000
);
1.164
f
,
0.000
f
,
1.596
f
,
-
0.8708
f
,
1.164
f
,
-
0.392
f
,
-
0.813
f
,
0.5296
f
,
1.164
f
,
2.017
f
,
0.000
f
,
-
1.081
f
,
0.0
f
,
0.000
f
,
0.000
f
,
1.0000
f
);
break
;
default:
break
;
...
...
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