[prev in list] [next in list] [prev in thread] [next in thread]
List: gstreamer-cvs
Subject: [gst-cvs] gst-plugins-bad: videosignal: add support for packed YUV
From: cymacs () kemper ! freedesktop ! org (René Stadler)
Date: 2009-09-26 16:15:26
Message-ID: 20090926161526.65E6610050 () kemper ! freedesktop ! org
[Download RAW message or body]
Module: gst-plugins-bad
Branch: master
Commit: 36ae3ad84465d0eaacb5cf5a5e2c552e2be864ae
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=36ae3ad84465d0eaacb5cf5a5e2c552e2be864ae
Author: René Stadler <mail@renestadler.de>
Date: Fri Sep 4 22:50:34 2009 +0300
videosignal: add support for packed YUV formats
---
gst/videosignal/gstvideodetect.c | 47 ++++++++++++++++++++-----------------
gst/videosignal/gstvideomark.c | 45 ++++++++++++++++++++----------------
2 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/gst/videosignal/gstvideodetect.c b/gst/videosignal/gstvideodetect.c
index 942392f..d55005f 100644
--- a/gst/videosignal/gstvideodetect.c
+++ b/gst/videosignal/gstvideodetect.c
@@ -145,14 +145,16 @@ static GstStaticPadTemplate gst_video_detect_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YV12, Y41B, Y42B, Y444 }"))
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV
+ ("{ I420, YV12, Y41B, Y42B, Y444, YUY2, UYVY, AYUV, YVYU }"))
);
static GstStaticPadTemplate gst_video_detect_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YV12, Y41B, Y42B, Y444 }"))
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV
+ ("{ I420, YV12, Y41B, Y42B, Y444, YUY2, UYVY, AYUV, YVYU }"))
);
static GstVideoFilterClass *parent_class = NULL;
@@ -212,7 +214,7 @@ gst_video_detect_post_message (GstVideoDetect * videodetect, \
GstBuffer * buffer,
static gdouble
gst_video_detect_calc_brightness (GstVideoDetect * videodetect, guint8 * data,
- gint width, gint height, gint stride)
+ gint width, gint height, gint row_stride, gint pixel_stride)
{
gint i, j;
guint64 sum;
@@ -220,10 +222,9 @@ gst_video_detect_calc_brightness (GstVideoDetect * videodetect, \
guint8 * data, sum = 0;
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
- sum += data[j];
+ sum += data[pixel_stride * j];
}
- /* move to next line */
- data += stride;
+ data += row_stride;
}
return sum / (255.0 * width * height);
}
@@ -233,8 +234,8 @@ gst_video_detect_yuv (GstVideoDetect * videodetect, GstBuffer * \
buffer) {
GstVideoFormat format;
gdouble brightness;
- gint i, pw, ph, stride, width, height;
- gint req_width, req_height;
+ gint i, pw, ph, row_stride, pixel_stride, offset;
+ gint width, height, req_width, req_height;
guint8 *d, *data;
guint pattern_data;
@@ -246,7 +247,9 @@ gst_video_detect_yuv (GstVideoDetect * videodetect, GstBuffer * \
buffer)
pw = videodetect->pattern_width;
ph = videodetect->pattern_height;
- stride = gst_video_format_get_row_stride (format, 0, width);
+ row_stride = gst_video_format_get_row_stride (format, 0, width);
+ pixel_stride = gst_video_format_get_pixel_stride (format, 0);
+ offset = gst_video_format_get_component_offset (format, 0, width, height);
req_width =
(videodetect->pattern_count + videodetect->pattern_data_count) * pw +
@@ -258,16 +261,16 @@ gst_video_detect_yuv (GstVideoDetect * videodetect, GstBuffer * \
buffer)
/* analyse the bottom left pixels */
for (i = 0; i < videodetect->pattern_count; i++) {
- d = data;
+ d = data + offset;
/* move to start of bottom left, adjust for offsets */
- d += stride * (height - ph - videodetect->bottom_offset) +
- videodetect->left_offset;
+ d += row_stride * (height - ph - videodetect->bottom_offset) +
+ pixel_stride * videodetect->left_offset;
/* move to i-th pattern */
- d += pw * i;
+ d += pixel_stride * pw * i;
/* calc brightness of width * height box */
- brightness =
- gst_video_detect_calc_brightness (videodetect, d, pw, ph, stride);
+ brightness = gst_video_detect_calc_brightness (videodetect, d, pw, ph,
+ row_stride, pixel_stride);
GST_DEBUG_OBJECT (videodetect, "brightness %f", brightness);
@@ -291,18 +294,18 @@ gst_video_detect_yuv (GstVideoDetect * videodetect, GstBuffer * \
buffer)
/* get the data of the pattern */
for (i = 0; i < videodetect->pattern_data_count; i++) {
- d = data;
+ d = data + offset;
/* move to start of bottom left, adjust for offsets */
- d += stride * (height - ph - videodetect->bottom_offset) +
- videodetect->left_offset;
+ d += row_stride * (height - ph - videodetect->bottom_offset) +
+ pixel_stride * videodetect->left_offset;
/* move after the fixed pattern */
- d += (videodetect->pattern_count * pw);
+ d += pixel_stride * (videodetect->pattern_count * pw);
/* move to i-th pattern data */
- d += pw * i;
+ d += pixel_stride * pw * i;
/* calc brightness of width * height box */
- brightness =
- gst_video_detect_calc_brightness (videodetect, d, pw, ph, stride);
+ brightness = gst_video_detect_calc_brightness (videodetect, d, pw, ph,
+ row_stride, pixel_stride);
/* update pattern, we just use the center to decide between black and white. */
pattern_data <<= 1;
if (brightness > videodetect->pattern_center)
diff --git a/gst/videosignal/gstvideomark.c b/gst/videosignal/gstvideomark.c
index 14de614..4ac47a0 100644
--- a/gst/videosignal/gstvideomark.c
+++ b/gst/videosignal/gstvideomark.c
@@ -92,14 +92,16 @@ static GstStaticPadTemplate gst_video_mark_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YV12, Y41B, Y42B, Y444 }"))
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV
+ ("{ I420, YV12, Y41B, Y42B, Y444, YUY2, UYVY, AYUV, YVYU }"))
);
static GstStaticPadTemplate gst_video_mark_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YV12, Y41B, Y42B, Y444 }"))
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV
+ ("{ I420, YV12, Y41B, Y42B, Y444, YUY2, UYVY, AYUV, YVYU }"))
);
static GstVideoFilterClass *parent_class = NULL;
@@ -129,16 +131,15 @@ gst_video_mark_set_caps (GstBaseTransform * btrans, GstCaps * \
incaps,
static void
gst_video_mark_draw_box (GstVideoMark * videomark, guint8 * data,
- gint width, gint height, gint stride, guint8 color)
+ gint width, gint height, gint row_stride, gint pixel_stride, guint8 color)
{
gint i, j;
for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) {
- data[j] = color;
+ data[pixel_stride * j] = color;
}
- /* move to next line */
- data += stride;
+ data += row_stride;
}
}
@@ -146,8 +147,8 @@ static GstFlowReturn
gst_video_mark_yuv (GstVideoMark * videomark, GstBuffer * buffer)
{
GstVideoFormat format;
- gint i, pw, ph, stride, width, height;
- gint req_width, req_height;
+ gint i, pw, ph, row_stride, pixel_stride, offset;
+ gint width, height, req_width, req_height;
guint8 *d, *data;
guint pattern_shift;
guint8 color;
@@ -160,7 +161,9 @@ gst_video_mark_yuv (GstVideoMark * videomark, GstBuffer * buffer)
pw = videomark->pattern_width;
ph = videomark->pattern_height;
- stride = gst_video_format_get_row_stride (format, 0, width);
+ row_stride = gst_video_format_get_row_stride (format, 0, width);
+ pixel_stride = gst_video_format_get_pixel_stride (format, 0);
+ offset = gst_video_format_get_component_offset (format, 0, width, height);
req_width =
(videomark->pattern_count + videomark->pattern_data_count) * pw +
@@ -175,12 +178,12 @@ gst_video_mark_yuv (GstVideoMark * videomark, GstBuffer * \
buffer)
/* draw the bottom left pixels */
for (i = 0; i < videomark->pattern_count; i++) {
- d = data;
+ d = data + offset;
/* move to start of bottom left */
- d += stride * (height - ph - videomark->bottom_offset) +
- videomark->left_offset;
+ d += row_stride * (height - ph - videomark->bottom_offset) +
+ pixel_stride * videomark->left_offset;
/* move to i-th pattern */
- d += pw * i;
+ d += pixel_stride * pw * i;
if (i & 1)
/* odd pixels must be white */
@@ -189,28 +192,30 @@ gst_video_mark_yuv (GstVideoMark * videomark, GstBuffer * \
buffer) color = 0;
/* draw box of width * height */
- gst_video_mark_draw_box (videomark, d, pw, ph, stride, color);
+ gst_video_mark_draw_box (videomark, d, pw, ph, row_stride, pixel_stride,
+ color);
}
pattern_shift = 1 << (videomark->pattern_data_count - 1);
/* get the data of the pattern */
for (i = 0; i < videomark->pattern_data_count; i++) {
- d = data;
+ d = data + offset;
/* move to start of bottom left, adjust for offsets */
- d += stride * (height - ph - videomark->bottom_offset) +
- videomark->left_offset;
+ d += row_stride * (height - ph - videomark->bottom_offset) +
+ pixel_stride * videomark->left_offset;
/* move after the fixed pattern */
- d += (videomark->pattern_count * pw);
+ d += pixel_stride * videomark->pattern_count * pw;
/* move to i-th pattern data */
- d += pw * i;
+ d += pixel_stride * pw * i;
if (videomark->pattern_data & pattern_shift)
color = 255;
else
color = 0;
- gst_video_mark_draw_box (videomark, d, pw, ph, stride, color);
+ gst_video_mark_draw_box (videomark, d, pw, ph, row_stride, pixel_stride,
+ color);
pattern_shift >>= 1;
}
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
gstreamer-cvs mailing list
gstreamer-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic