diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-04-18 09:59:43 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-04-18 09:59:43 +0000 |
| commit | a69f435ff117baa829bca8edb9c92fbbef0a7e70 (patch) | |
| tree | 8d58ead296de4ede0903e1412843ce512bd559c7 | |
| parent | de06067c050cbdfef43dbf5bbec8f0a12aa8a930 (diff) | |
| download | gstreamer-plugins-base-a69f435ff117baa829bca8edb9c92fbbef0a7e70.tar.gz | |
ext/pango/gsttextoverlay.c: Don't crop off bottom (fixes #172845 minus a pixel at the left in
Original commit message from CVS:
* ext/pango/gsttextoverlay.c: (render_text),
(gst_text_overlay_blit_yuv420):
Don't crop off bottom (fixes #172845 minus a pixel at the left in
Ubuntu...?).
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_init),
(gst_asf_demux_process_chunk), (gst_asf_demux_change_state),
(gst_asf_demux_add_audio_stream), (gst_asf_demux_add_video_stream),
(gst_asf_demux_setup_pad):
* gst/asfdemux/gstasfdemux.h:
Frame rate estimation (#168406).
| -rw-r--r-- | ext/pango/gsttextoverlay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/pango/gsttextoverlay.c b/ext/pango/gsttextoverlay.c index 5346fb2a4..c79762848 100644 --- a/ext/pango/gsttextoverlay.c +++ b/ext/pango/gsttextoverlay.c @@ -217,7 +217,7 @@ render_text (GstTextOverlay * overlay) pango_layout_get_pixel_extents (overlay->layout, &ink_rect, &logical_rect); resize_bitmap (overlay, ink_rect.width, ink_rect.height + ink_rect.y); - pango_ft2_render_layout (&overlay->bitmap, overlay->layout, 0, 0); + pango_ft2_render_layout (&overlay->bitmap, overlay->layout, 1, 0); overlay->baseline_y = ink_rect.y; } @@ -317,7 +317,7 @@ gst_text_overlay_blit_yuv420 (GstTextOverlay * overlay, FT_Bitmap * bitmap, int rowinc, bit_rowinc, uv_rowinc; guchar *p, *bitp, *u_p; int video_width = overlay->width, video_height = overlay->height; - int bitmap_x0 = x0 < 1 ? -(x0 - 1) : 1; /* 1 pixel border */ + int bitmap_x0 = 0; //x0 < 1 ? -(x0 - 1) : 1; /* 1 pixel border */ int bitmap_y0 = y0 < 1 ? -(y0 - 1) : 1; /* 1 pixel border */ int bitmap_width = bitmap->width - bitmap_x0; int bitmap_height = bitmap->rows - bitmap_y0; @@ -339,7 +339,7 @@ gst_text_overlay_blit_yuv420 (GstTextOverlay * overlay, FT_Bitmap * bitmap, x1 = x0 + bitmap_x0; p = pixbuf + video_width * y1 + x1; bitp = bitmap->buffer + bitmap->pitch * bitmap_y0 + bitmap_x0; - for (y = bitmap_y0; y < bitmap_height; y++) { + for (y = bitmap_y0; y < bitmap_y0 + bitmap_height; y++) { int n; for (n = bitmap_width; n > 0; --n) { @@ -368,7 +368,7 @@ gst_text_overlay_blit_yuv420 (GstTextOverlay * overlay, FT_Bitmap * bitmap, skip_y = 0; skip_x = 0; - for (; y < bitmap_height; y++) { + for (; y < bitmap_y0 + bitmap_height; y++) { int n; x1 = x0 + bitmap_x0; |