mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

zbar: use correct stride

Browse source 
Fixes detection for images with a width that's not a multiple of four.

Based on patch by: Kaj-Michael Lang <milang@tal.org>
Based on patch by: Stefan Kost <ensonic@users.sf.net>

https://bugzilla.gnome.org/show_bug.cgi?id=630830
This commit is contained in:
Tim-Philipp Müller 2010-11-02 17:18:52 +00:00
parent ff0a34ce3d
commit 7ddd7f7809
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/zbar/gstzbar.c
View file

@ -254,14 +254,23 @@ gst_zbar_set_caps (GstBaseTransform * base, GstCaps * incaps, GstCaps * outcaps)
GstZBar *zbar = GST_ZBAR (base); GstZBar *zbar = GST_ZBAR (base);
GstStructure *structure; GstStructure *structure;
gboolean res; gboolean res;
guint32 fourcc;
gint width, height;
GST_DEBUG_OBJECT (zbar, GST_DEBUG_OBJECT (zbar,
"set_caps: in %" GST_PTR_FORMAT " out %" GST_PTR_FORMAT, incaps, outcaps); "set_caps: in %" GST_PTR_FORMAT " out %" GST_PTR_FORMAT, incaps, outcaps);
structure = gst_caps_get_structure (incaps, 0); structure = gst_caps_get_structure (incaps, 0);
res = gst_structure_get_int (structure, "width", &zbar->width); res = gst_structure_get_int (structure, "width", &width);
res &= gst_structure_get_int (structure, "height", &zbar->height); res &= gst_structure_get_int (structure, "height", &height);
res &= gst_structure_get_fourcc (structure, "format", &fourcc);
if (res) {
zbar->width = width;
zbar->height = height;
zbar->format = gst_video_format_from_fourcc (fourcc);
}
return res; return res;
} }
@ -271,7 +280,7 @@ gst_zbar_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
{ {
GstZBar *zbar = GST_ZBAR (base); GstZBar *zbar = GST_ZBAR (base);
guint8 *data; guint8 *data;
guint size; guint size, rowstride;
zbar_image_t *image; zbar_image_t *image;
const zbar_symbol_t *symbol; const zbar_symbol_t *symbol;
int n; int n;
@ -283,10 +292,11 @@ gst_zbar_transform_ip (GstBaseTransform * base, GstBuffer * outbuf)
size = GST_BUFFER_SIZE (outbuf); size = GST_BUFFER_SIZE (outbuf);
image = zbar_image_create (); image = zbar_image_create ();
zbar_image_set_format (image, GST_MAKE_FOURCC ('Y', '8', '0', '0')); zbar_image_set_format (image, GST_MAKE_FOURCC ('Y', '8', '0', '0'));
zbar_image_set_size (image, zbar->width, zbar->height); rowstride = gst_video_format_get_row_stride (zbar->format, 0, zbar->width);
zbar_image_set_data (image, (gpointer) data, zbar->width * zbar->height, zbar_image_set_size (image, rowstride, zbar->height);
NULL); zbar_image_set_data (image, (gpointer) data, rowstride * zbar->height, NULL);
/* scan the image for barcodes */ /* scan the image for barcodes */
n = zbar_scan_image (zbar->scanner, image); n = zbar_scan_image (zbar->scanner, image);
@ -336,6 +346,10 @@ gst_zbar_start (GstBaseTransform * base)
{ {
GstZBar *zbar = GST_ZBAR (base); GstZBar *zbar = GST_ZBAR (base);
zbar->width = 0;
zbar->height = 0;
zbar->format = GST_VIDEO_FORMAT_UNKNOWN;
/* start the cache if enabled (e.g. for filtering dupes) */ /* start the cache if enabled (e.g. for filtering dupes) */
zbar_image_scanner_enable_cache (zbar->scanner, zbar->cache); zbar_image_scanner_enable_cache (zbar->scanner, zbar->cache);

7
ext/zbar/gstzbar.h
View file

@ -22,6 +22,7 @@
#define __GST_VIDEO_ZBAR_H__ #define __GST_VIDEO_ZBAR_H__
#include <gst/video/gstvideofilter.h> #include <gst/video/gstvideofilter.h>
#include <gst/video/video.h>
#include <zbar.h> #include <zbar.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -51,8 +52,10 @@ struct _GstZBar
GstVideoFilter videofilter; GstVideoFilter videofilter;
/* format */ /* format */
gint width; gint width;
gint height; gint height;
GstVideoFormat format;
/* properties */ /* properties */
gboolean message; gboolean message;