summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-02-15 06:28:56 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-02-15 06:28:56 (GMT)
commite91af4016e8482a9b1437b8edc71347b5cfd2a83 (patch)
tree83fbaec76346fac45a340bfb599c57ca4e7f726f /src/multimedia
parente486ec3b4730d470033a0a88b1cc56bc98d8d00e (diff)
parenta0839595a5738b4c9b3f2e80a8265df885d8d80c (diff)
downloadQt-e91af4016e8482a9b1437b8edc71347b5cfd2a83.zip
Qt-e91af4016e8482a9b1437b8edc71347b5cfd2a83.tar.gz
Qt-e91af4016e8482a9b1437b8edc71347b5cfd2a83.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/base/qgraphicsvideoitem.cpp6
-rw-r--r--src/multimedia/base/qpaintervideosurface.cpp26
2 files changed, 17 insertions, 15 deletions
diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index 8aba269..85369db 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -47,7 +47,7 @@
#include <QtMultimedia/qvideooutputcontrol.h>
#include <QtMultimedia/qvideorenderercontrol.h>
#include <QtMultimedia/qvideosurfaceformat.h>
-
+#include <QtOpenGL/qgl.h>
QT_BEGIN_NAMESPACE
@@ -384,9 +384,6 @@ void QGraphicsVideoItem::paint(
if (d->surface && d->surface->isActive()) {
d->surface->paint(painter, d->boundingRect, d->sourceRect);
d->surface->setReady(true);
-#ifndef QGRAPHICSVIDEOITEM_SHADERS // Flickers
- }
-#else
} else if (d->updatePaintDevice && (painter->paintEngine()->type() == QPaintEngine::OpenGL
|| painter->paintEngine()->type() == QPaintEngine::OpenGL2)) {
d->updatePaintDevice = false;
@@ -398,7 +395,6 @@ void QGraphicsVideoItem::paint(
d->surface->setShaderType(QPainterVideoSurface::FragmentProgramShader);
}
}
-#endif
}
/*!
diff --git a/src/multimedia/base/qpaintervideosurface.cpp b/src/multimedia/base/qpaintervideosurface.cpp
index 533ddee..f7ffb02 100644
--- a/src/multimedia/base/qpaintervideosurface.cpp
+++ b/src/multimedia/base/qpaintervideosurface.cpp
@@ -362,23 +362,23 @@ void QVideoSurfaceGLPainter::updateColors(int brightness, int contrast, int hue,
{
const qreal b = brightness / 200.0;
const qreal c = contrast / 100.0 + 1.0;
- const qreal h = hue / 200.0;
+ const qreal h = hue / 100.0;
const qreal s = saturation / 100.0 + 1.0;
const qreal cosH = qCos(M_PI * h);
const qreal sinH = qSin(M_PI * h);
- const qreal h11 = -0.4728 * cosH + 0.7954 * sinH + 1.4728;
- const qreal h21 = -0.9253 * cosH - 0.0118 * sinH + 0.9523;
- const qreal h31 = 0.4525 * cosH + 0.8072 * sinH - 0.4524;
+ const qreal h11 = 0.787 * cosH - 0.213 * sinH + 0.213;
+ const qreal h21 = -0.213 * cosH + 0.143 * sinH + 0.213;
+ const qreal h31 = -0.213 * cosH - 0.787 * sinH + 0.213;
- const qreal h12 = 1.4728 * cosH - 1.3728 * sinH - 1.4728;
- const qreal h22 = 1.9253 * cosH + 0.5891 * sinH - 0.9253;
- const qreal h32 = -0.4525 * cosH - 1.9619 * sinH + 0.4525;
+ const qreal h12 = -0.715 * cosH - 0.715 * sinH + 0.715;
+ const qreal h22 = 0.285 * cosH + 0.140 * sinH + 0.715;
+ const qreal h32 = -0.715 * cosH + 0.715 * sinH + 0.715;
- const qreal h13 = 1.4728 * cosH - 0.2181 * sinH - 1.4728;
- const qreal h23 = 0.9253 * cosH + 1.1665 * sinH - 0.9253;
- const qreal h33 = 0.5475 * cosH - 1.3846 * sinH + 0.4525;
+ const qreal h13 = -0.072 * cosH + 0.928 * sinH + 0.072;
+ const qreal h23 = -0.072 * cosH - 0.283 * sinH + 0.072;
+ const qreal h33 = 0.928 * cosH + 0.072 * sinH + 0.072;
const qreal sr = (1.0 - s) * 0.3086;
const qreal sg = (1.0 - s) * 0.6094;
@@ -982,6 +982,9 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint(
if (m_frame.isValid()) {
painter->beginNativePainting();
+ glEnable(GL_STENCIL_TEST);
+ glEnable(GL_SCISSOR_TEST);
+
const int width = QGLContext::currentContext()->device()->width();
const int height = QGLContext::currentContext()->device()->height();
@@ -1072,6 +1075,9 @@ QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint(
m_program.release();
+
+ glDisable(GL_SCISSOR_TEST);
+ glDisable(GL_STENCIL_TEST);
painter->endNativePainting();
}
return QAbstractVideoSurface::NoError;