mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 01:30:38 +00:00
fix compilation after merge
This commit is contained in:
parent
da1c863711
commit
0f3fdf18e0
3 changed files with 19 additions and 27 deletions
|
@ -1945,8 +1945,8 @@ gst_text_overlay_push_frame (GstTextOverlay * overlay, GstBuffer * video_frame)
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_xBGR:
|
case GST_VIDEO_FORMAT_xBGR:
|
||||||
gst_text_overlay_shade_xBGR (overlay,
|
gst_text_overlay_shade_xBGR (overlay, data,
|
||||||
GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
|
xpos, xpos + overlay->image_width,
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_BGRx:
|
case GST_VIDEO_FORMAT_BGRx:
|
||||||
|
@ -1955,28 +1955,28 @@ gst_text_overlay_push_frame (GstTextOverlay * overlay, GstBuffer * video_frame)
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_RGBx:
|
case GST_VIDEO_FORMAT_RGBx:
|
||||||
gst_text_overlay_shade_RGBx (overlay,
|
gst_text_overlay_shade_RGBx (overlay, data,
|
||||||
GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
|
xpos, xpos + overlay->image_width,
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_ARGB:
|
case GST_VIDEO_FORMAT_ARGB:
|
||||||
gst_text_overlay_shade_ARGB (overlay,
|
gst_text_overlay_shade_ARGB (overlay, data,
|
||||||
GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
|
xpos, xpos + overlay->image_width,
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_ABGR:
|
case GST_VIDEO_FORMAT_ABGR:
|
||||||
gst_text_overlay_shade_ABGR (overlay,
|
gst_text_overlay_shade_ABGR (overlay, data,
|
||||||
GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
|
xpos, xpos + overlay->image_width,
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_RGBA:
|
case GST_VIDEO_FORMAT_RGBA:
|
||||||
gst_text_overlay_shade_RGBA (overlay,
|
gst_text_overlay_shade_RGBA (overlay, data,
|
||||||
GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
|
xpos, xpos + overlay->image_width,
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_BGRA:
|
case GST_VIDEO_FORMAT_BGRA:
|
||||||
gst_text_overlay_shade_BGRA (overlay,
|
gst_text_overlay_shade_BGRA (overlay, data,
|
||||||
GST_BUFFER_DATA (video_frame), xpos, xpos + overlay->image_width,
|
xpos, xpos + overlay->image_width,
|
||||||
ypos, ypos + overlay->image_height);
|
ypos, ypos + overlay->image_height);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -2009,28 +2009,22 @@ gst_text_overlay_push_frame (GstTextOverlay * overlay, GstBuffer * video_frame)
|
||||||
gst_text_overlay_blit_xRGB (overlay, data, xpos, ypos);
|
gst_text_overlay_blit_xRGB (overlay, data, xpos, ypos);
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_RGBx:
|
case GST_VIDEO_FORMAT_RGBx:
|
||||||
gst_text_overlay_blit_RGBx (overlay,
|
gst_text_overlay_blit_RGBx (overlay, data, xpos, ypos);
|
||||||
GST_BUFFER_DATA (video_frame), xpos, ypos);
|
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_xBGR:
|
case GST_VIDEO_FORMAT_xBGR:
|
||||||
gst_text_overlay_blit_xBGR (overlay,
|
gst_text_overlay_blit_xBGR (overlay, data, xpos, ypos);
|
||||||
GST_BUFFER_DATA (video_frame), xpos, ypos);
|
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_ARGB:
|
case GST_VIDEO_FORMAT_ARGB:
|
||||||
gst_text_overlay_blit_ARGB (overlay,
|
gst_text_overlay_blit_ARGB (overlay, data, xpos, ypos);
|
||||||
GST_BUFFER_DATA (video_frame), xpos, ypos);
|
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_ABGR:
|
case GST_VIDEO_FORMAT_ABGR:
|
||||||
gst_text_overlay_blit_ABGR (overlay,
|
gst_text_overlay_blit_ABGR (overlay, data, xpos, ypos);
|
||||||
GST_BUFFER_DATA (video_frame), xpos, ypos);
|
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_RGBA:
|
case GST_VIDEO_FORMAT_RGBA:
|
||||||
gst_text_overlay_blit_RGBA (overlay,
|
gst_text_overlay_blit_RGBA (overlay, data, xpos, ypos);
|
||||||
GST_BUFFER_DATA (video_frame), xpos, ypos);
|
|
||||||
break;
|
break;
|
||||||
case GST_VIDEO_FORMAT_BGRA:
|
case GST_VIDEO_FORMAT_BGRA:
|
||||||
gst_text_overlay_blit_BGRA (overlay,
|
gst_text_overlay_blit_BGRA (overlay, data, xpos, ypos);
|
||||||
GST_BUFFER_DATA (video_frame), xpos, ypos);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
|
|
@ -580,7 +580,7 @@ gst_tag_to_metadata_block_picture (const gchar * tag,
|
||||||
&image_type, "width", G_TYPE_INT, &width, "height", G_TYPE_INT, &height,
|
&image_type, "width", G_TYPE_INT, &width, "height", G_TYPE_INT, &height,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
metadata_block_len = 32 + mime_type_len + GST_BUFFER_SIZE (buffer);
|
metadata_block_len = 32 + mime_type_len + gst_buffer_get_size (buffer);
|
||||||
gst_byte_writer_init_with_size (&writer, metadata_block_len, TRUE);
|
gst_byte_writer_init_with_size (&writer, metadata_block_len, TRUE);
|
||||||
|
|
||||||
if (image_type == GST_TAG_IMAGE_TYPE_NONE
|
if (image_type == GST_TAG_IMAGE_TYPE_NONE
|
||||||
|
|
|
@ -429,8 +429,6 @@ GST_START_TEST (test_video_formats)
|
||||||
fail_unless_equals_int (off1, (unsigned long) paintinfo.up);
|
fail_unless_equals_int (off1, (unsigned long) paintinfo.up);
|
||||||
fail_unless_equals_int (off2, (unsigned long) paintinfo.vp);
|
fail_unless_equals_int (off2, (unsigned long) paintinfo.vp);
|
||||||
|
|
||||||
skip_check:
|
|
||||||
|
|
||||||
/* should be 0 if there's no alpha component */
|
/* should be 0 if there's no alpha component */
|
||||||
off3 = gst_video_format_get_component_offset (fmt, 3, w, h);
|
off3 = gst_video_format_get_component_offset (fmt, 3, w, h);
|
||||||
fail_unless_equals_int (off3, (unsigned long) paintinfo.ap);
|
fail_unless_equals_int (off3, (unsigned long) paintinfo.ap);
|
||||||
|
|
Loading…
Reference in a new issue