[cogl/cogl-1.18] cogl-gst: video-sink: fix YV12/I420 support
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.18] cogl-gst: video-sink: fix YV12/I420 support
- Date: Wed, 1 Jan 2014 17:57:01 +0000 (UTC)
commit 9a879a761644c9dbbe3a0dc23835132392f6dbcc
Author: Robert Bragg <robert linux intel com>
Date: Wed Jan 1 17:35:50 2014 +0000
cogl-gst: video-sink: fix YV12/I420 support
This fixes a mistake in commit 637728dd89d51bc28 that was meant to fix
yv12/i420 support but when the patch was updated based on review to use
COGL_PIXEL_FORMAT_A instead of COGL_PIXEL_FORMAT_G the corresponding
glsl code wasn't also updated to sample the .a component.
(cherry picked from commit a02c55105c705471866df2d306879d8616289f2a)
cogl-gst/cogl-gst-video-sink.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl-gst/cogl-gst-video-sink.c b/cogl-gst/cogl-gst-video-sink.c
index 9a811b2..acfaa77 100644
--- a/cogl-gst/cogl-gst-video-sink.c
+++ b/cogl-gst/cogl-gst-video-sink.c
@@ -718,9 +718,9 @@ cogl_gst_yv12_glsl_setup_pipeline (CoglGstVideoSink *sink,
"cogl_gst_sample_video%i (vec2 UV)\n"
"{\n"
" float y = 1.1640625 * "
- "(texture2D (cogl_sampler%i, UV).g - 0.0625);\n"
- " float u = texture2D (cogl_sampler%i, UV).g - 0.5;\n"
- " float v = texture2D (cogl_sampler%i, UV).g - 0.5;\n"
+ "(texture2D (cogl_sampler%i, UV).a - 0.0625);\n"
+ " float u = texture2D (cogl_sampler%i, UV).a - 0.5;\n"
+ " float v = texture2D (cogl_sampler%i, UV).a - 0.5;\n"
" vec4 color;\n"
" color.r = y + 1.59765625 * v;\n"
" color.g = y - 0.390625 * u - 0.8125 * v;\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]