Commit f882a833 authored by Gus Grubba's avatar Gus Grubba

Windows build

parent db5708e6
......@@ -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;
}
......
......@@ -51,10 +51,6 @@ 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")
......@@ -67,7 +63,6 @@ LinuxBuild {
$$GST_ROOT/lib/gstreamer-1.0\include \
$$GST_ROOT/lib/glib-2.0/include
}
}
}
VideoEnabled {
......
#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)
......
......@@ -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.164f, 0.000f, 1.596f, -0.8708f,
1.164f, -0.392f, -0.813f, 0.5296f,
1.164f, 2.017f, 0.000f, -1.081f,
0.0f, 0.000f, 0.000f, 1.0000f);
break;
default:
break;
......
......@@ -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.164f, 0.000f, 1.596f, -0.8708f,
1.164f, -0.392f, -0.813f, 0.5296f,
1.164f, 2.017f, 0.000f, -1.081f,
0.0f, 0.000f, 0.000f, 1.0000f);
break;
default:
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment