remove the video converter from vaapi buffer meta

Since all the video converter were deprecated in gstreamer-1.2, we don't need
to handle them anymore in the vaapi's buffer meta.

This patch removes its usage and the buffer meta's API for that.

https://bugzilla.gnome.org/show_bug.cgi?id=745728
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-03-19 21:20:26 +01:00 committed by Víctor Manuel Jáquez Leal
parent 3fccc83278
commit 267422dde5
3 changed files with 2 additions and 65 deletions

View file

@ -33,25 +33,6 @@
#include "gstcompat.h" #include "gstcompat.h"
#include "gstvaapivideobuffer.h" #include "gstvaapivideobuffer.h"
static inline GstBuffer *
gst_surface_buffer_new (void)
{
return gst_buffer_new ();
}
static GFunc
get_surface_converter (GstVaapiDisplay * display)
{
GFunc func;
switch (gst_vaapi_display_get_class_type (display)) {
default:
func = NULL;
break;
}
return func;
}
static GstBuffer * static GstBuffer *
new_vbuffer (GstVaapiVideoMeta * meta) new_vbuffer (GstVaapiVideoMeta * meta)
{ {
@ -59,10 +40,7 @@ new_vbuffer (GstVaapiVideoMeta * meta)
g_return_val_if_fail (meta != NULL, NULL); g_return_val_if_fail (meta != NULL, NULL);
gst_vaapi_video_meta_set_surface_converter (meta, buffer = gst_buffer_new ();
get_surface_converter (gst_vaapi_video_meta_get_display (meta)));
buffer = gst_surface_buffer_new ();
if (buffer) if (buffer)
gst_buffer_set_vaapi_video_meta (buffer, meta); gst_buffer_set_vaapi_video_meta (buffer, meta);
gst_vaapi_video_meta_unref (meta); gst_vaapi_video_meta_unref (meta);
@ -80,7 +58,7 @@ gst_vaapi_video_buffer_new (GstVaapiVideoMeta * meta)
GstBuffer * GstBuffer *
gst_vaapi_video_buffer_new_empty (void) gst_vaapi_video_buffer_new_empty (void)
{ {
return gst_surface_buffer_new (); return gst_buffer_new ();
} }
GstBuffer * GstBuffer *

View file

@ -588,38 +588,6 @@ gst_vaapi_video_meta_set_surface_proxy (GstVaapiVideoMeta * meta,
} }
} }
/**
* gst_vaapi_video_meta_get_surface_converter:
* @meta: a #GstVaapiVideoMeta
*
* Retrieves the surface converter bound to the @meta.
*
* Return value: the surface converter associated with the video @meta
*/
GFunc
gst_vaapi_video_meta_get_surface_converter (GstVaapiVideoMeta * meta)
{
g_return_val_if_fail (GST_VAAPI_IS_VIDEO_META (meta), NULL);
return meta->converter;
}
/**
* gst_vaapi_video_meta_set_surface_converter:
* @meta: a #GstVaapiVideoMeta
* @func: a pointer to the surface converter function
*
* Sets the @meta surface converter function to @func.
*/
void
gst_vaapi_video_meta_set_surface_converter (GstVaapiVideoMeta * meta,
GFunc func)
{
g_return_if_fail (GST_VAAPI_IS_VIDEO_META (meta));
meta->converter = func;
}
/** /**
* gst_vaapi_video_meta_get_render_flags: * gst_vaapi_video_meta_get_render_flags:
* @meta: a #GstVaapiVideoMeta * @meta: a #GstVaapiVideoMeta

View file

@ -106,15 +106,6 @@ void
gst_vaapi_video_meta_set_surface_proxy (GstVaapiVideoMeta * meta, gst_vaapi_video_meta_set_surface_proxy (GstVaapiVideoMeta * meta,
GstVaapiSurfaceProxy * proxy); GstVaapiSurfaceProxy * proxy);
G_GNUC_INTERNAL
GFunc
gst_vaapi_video_meta_get_surface_converter (GstVaapiVideoMeta * meta);
G_GNUC_INTERNAL
void
gst_vaapi_video_meta_set_surface_converter (GstVaapiVideoMeta * meta,
GFunc func);
G_GNUC_INTERNAL G_GNUC_INTERNAL
guint guint
gst_vaapi_video_meta_get_render_flags (GstVaapiVideoMeta * meta); gst_vaapi_video_meta_get_render_flags (GstVaapiVideoMeta * meta);