mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 01:02:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

textoverlay: clamp shaded background box coordinates in one place

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-11-07 00:57:18 +00:00
parent 4aace8e0eb
commit bedbfd0091
1 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ext/pango/gstbasetextoverlay.c
View file

@ -1432,9 +1432,6 @@ gst_base_text_overlay_render_pangocairo (GstBaseTextOverlay * overlay,
gst_base_text_overlay_set_composition (overlay); gst_base_text_overlay_set_composition (overlay);
} }
#define BOX_XPAD 6
#define BOX_YPAD 6
static inline void static inline void
gst_base_text_overlay_shade_planar_Y (GstBaseTextOverlay * overlay, gst_base_text_overlay_shade_planar_Y (GstBaseTextOverlay * overlay,
GstVideoFrame * dest, gint x0, gint x1, gint y0, gint y1) GstVideoFrame * dest, gint x0, gint x1, gint y0, gint y1)
@ -1445,12 +1442,6 @@ gst_base_text_overlay_shade_planar_Y (GstBaseTextOverlay * overlay,
dest_stride = dest->info.stride[0]; dest_stride = dest->info.stride[0];
dest_ptr = dest->data[0]; dest_ptr = dest->data[0];
x0 = CLAMP (x0 - BOX_XPAD, 0, overlay->width);
x1 = CLAMP (x1 + BOX_XPAD, 0, overlay->width);
y0 = CLAMP (y0 - BOX_YPAD, 0, overlay->height);
y1 = CLAMP (y1 + BOX_YPAD, 0, overlay->height);
for (i = y0; i < y1; ++i) { for (i = y0; i < y1; ++i) {
for (j = x0; j < x1; ++j) { for (j = x0; j < x1; ++j) {
gint y = dest_ptr[(i * dest_stride) + j] + overlay->shading_value; gint y = dest_ptr[(i * dest_stride) + j] + overlay->shading_value;
@ -1472,12 +1463,6 @@ gst_base_text_overlay_shade_packed_Y (GstBaseTextOverlay * overlay,
dest_ptr = GST_VIDEO_FRAME_COMP_DATA (dest, 0); dest_ptr = GST_VIDEO_FRAME_COMP_DATA (dest, 0);
pixel_stride = GST_VIDEO_FRAME_COMP_PSTRIDE (dest, 0); pixel_stride = GST_VIDEO_FRAME_COMP_PSTRIDE (dest, 0);
x0 = CLAMP (x0 - BOX_XPAD, 0, overlay->width);
x1 = CLAMP (x1 + BOX_XPAD, 0, overlay->width);
y0 = CLAMP (y0 - BOX_YPAD, 0, overlay->height);
y1 = CLAMP (y1 + BOX_YPAD, 0, overlay->height);
if (x0 != 0) if (x0 != 0)
x0 = GST_VIDEO_FORMAT_INFO_SCALE_WIDTH (dest->info.finfo, 0, x0); x0 = GST_VIDEO_FORMAT_INFO_SCALE_WIDTH (dest->info.finfo, 0, x0);
if (x1 != 0) if (x1 != 0)
@ -1513,12 +1498,6 @@ gst_base_text_overlay_shade_xRGB (GstBaseTextOverlay * overlay,
dest_ptr = dest->data[0]; dest_ptr = dest->data[0];
x0 = CLAMP (x0 - BOX_XPAD, 0, overlay->width);
x1 = CLAMP (x1 + BOX_XPAD, 0, overlay->width);
y0 = CLAMP (y0 - BOX_YPAD, 0, overlay->height);
y1 = CLAMP (y1 + BOX_YPAD, 0, overlay->height);
for (i = y0; i < y1; i++) { for (i = y0; i < y1; i++) {
for (j = x0; j < x1; j++) { for (j = x0; j < x1; j++) {
gint y, y_pos, k; gint y, y_pos, k;
@ -1542,12 +1521,6 @@ gint x0, gint x1, gint y0, gint y1) \
\ \
dest_ptr = dest->data[0];\ dest_ptr = dest->data[0];\
\ \
x0 = CLAMP (x0 - BOX_XPAD, 0, overlay->width);\
x1 = CLAMP (x1 + BOX_XPAD, 0, overlay->width);\
\
y0 = CLAMP (y0 - BOX_YPAD, 0, overlay->height);\
y1 = CLAMP (y1 + BOX_YPAD, 0, overlay->height);\
\
for (i = y0; i < y1; i++) {\ for (i = y0; i < y1; i++) {\
for (j = x0; j < x1; j++) {\ for (j = x0; j < x1; j++) {\
gint y, y_pos, k;\ gint y, y_pos, k;\
@ -1598,10 +1571,20 @@ gst_base_text_overlay_render_text (GstBaseTextOverlay * overlay,
overlay->need_render = FALSE; overlay->need_render = FALSE;
} }
/* FIXME: should probably be relative to width/height (adjusted for PAR) */
#define BOX_XPAD 6
#define BOX_YPAD 6
static void static void
gst_base_text_overlay_shade_background (GstBaseTextOverlay * overlay, gst_base_text_overlay_shade_background (GstBaseTextOverlay * overlay,
GstVideoFrame * frame, gint x0, gint x1, gint y0, gint y1) GstVideoFrame * frame, gint x0, gint x1, gint y0, gint y1)
{ {
x0 = CLAMP (x0 - BOX_XPAD, 0, overlay->width);
x1 = CLAMP (x1 + BOX_XPAD, 0, overlay->width);
y0 = CLAMP (y0 - BOX_YPAD, 0, overlay->height);
y1 = CLAMP (y1 + BOX_YPAD, 0, overlay->height);
switch (overlay->format) { switch (overlay->format) {
case GST_VIDEO_FORMAT_I420: case GST_VIDEO_FORMAT_I420:
case GST_VIDEO_FORMAT_NV12: case GST_VIDEO_FORMAT_NV12: