mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: add new base object, store display in there.

Browse source 
Introduce a new GstVaapiPluginBase object that will contain all common
data structures and perform all common tasks. First step is to have a
single place to hold VA displays.

While we are at it, also make sure to store and subsequently release
the appropriate debug category for the subclasses.
This commit is contained in:
Gwenole Beauchesne 2013-12-13 10:24:26 +01:00
parent 61f6cbffc6
commit 7e58d60854
15 changed files with 391 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/vaapi/Makefile.am
View file

@ -36,6 +36,7 @@ endif
libgstvaapi_source_c = \ libgstvaapi_source_c = \
gstvaapi.c \ gstvaapi.c \
gstvaapidecode.c \ gstvaapidecode.c \
gstvaapipluginbase.c \
gstvaapipluginutil.c \ gstvaapipluginutil.c \
gstvaapipostproc.c \ gstvaapipostproc.c \
gstvaapisink.c \ gstvaapisink.c \
@ -47,6 +48,7 @@ libgstvaapi_source_c = \
libgstvaapi_source_h = \ libgstvaapi_source_h = \
gstvaapidecode.h \ gstvaapidecode.h \
gstvaapipluginbase.h \
gstvaapipluginutil.h \ gstvaapipluginutil.h \
gstvaapipostproc.h \ gstvaapipostproc.h \
gstvaapisink.h \ gstvaapisink.h \

37
gst/vaapi/gstvaapidecode.c
View file

@ -120,7 +120,7 @@ gst_vaapidecode_set_video_context(GstVideoContext *context, const gchar *type,
const GValue *value) const GValue *value)
{ {
GstVaapiDecode *decode = GST_VAAPIDECODE (context); GstVaapiDecode *decode = GST_VAAPIDECODE (context);
gst_vaapi_set_display (type, value, &decode->display); gst_vaapi_set_display (type, value, &GST_VAAPI_PLUGIN_BASE_DISPLAY(decode));
} }
static void static void
@ -518,7 +518,7 @@ gst_vaapidecode_decide_allocation(GstVideoDecoder *vdec, GstQuery *query)
gst_video_info_set_format(&vi, GST_VIDEO_FORMAT_NV12, gst_video_info_set_format(&vi, GST_VIDEO_FORMAT_NV12,
GST_VIDEO_INFO_WIDTH(&vi), GST_VIDEO_INFO_HEIGHT(&vi)); GST_VIDEO_INFO_WIDTH(&vi), GST_VIDEO_INFO_HEIGHT(&vi));
g_return_val_if_fail(decode->display != NULL, FALSE); g_return_val_if_fail(GST_VAAPI_PLUGIN_BASE_DISPLAY(decode) != NULL, FALSE);
if (gst_query_get_n_allocation_pools(query) > 0) { if (gst_query_get_n_allocation_pools(query) > 0) {
gst_query_parse_nth_allocation_pool(query, 0, &pool, &size, &min, &max); gst_query_parse_nth_allocation_pool(query, 0, &pool, &size, &min, &max);
@ -536,7 +536,8 @@ gst_vaapidecode_decide_allocation(GstVideoDecoder *vdec, GstQuery *query)
GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META)) { GST_BUFFER_POOL_OPTION_VAAPI_VIDEO_META)) {
GST_INFO("no pool or doesn't support GstVaapiVideoMeta, " GST_INFO("no pool or doesn't support GstVaapiVideoMeta, "
"making new pool"); "making new pool");
pool = gst_vaapi_video_buffer_pool_new(decode->display); pool = gst_vaapi_video_buffer_pool_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(decode));
if (!pool) if (!pool)
goto error_create_pool; goto error_create_pool;
@ -593,7 +594,7 @@ gst_vaapidecode_set_context(GstElement *element, GstContext *context)
if (gst_vaapi_video_context_get_display(context, &display)) { if (gst_vaapi_video_context_get_display(context, &display)) {
GST_INFO_OBJECT(element, "set display %p", display); GST_INFO_OBJECT(element, "set display %p", display);
gst_vaapi_display_replace(&decode->display, display); GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(decode, display);
gst_vaapi_display_unref(display); gst_vaapi_display_unref(display);
} }
} }
@ -603,7 +604,7 @@ static inline gboolean
gst_vaapidecode_ensure_display(GstVaapiDecode *decode) gst_vaapidecode_ensure_display(GstVaapiDecode *decode)
{ {
return gst_vaapi_ensure_display(decode, GST_VAAPI_DISPLAY_TYPE_ANY, return gst_vaapi_ensure_display(decode, GST_VAAPI_DISPLAY_TYPE_ANY,
&decode->display); &GST_VAAPI_PLUGIN_BASE_DISPLAY(decode));
} }
static inline guint static inline guint
@ -619,7 +620,7 @@ gst_vaapidecode_create(GstVaapiDecode *decode, GstCaps *caps)
if (!gst_vaapidecode_ensure_display(decode)) if (!gst_vaapidecode_ensure_display(decode))
return FALSE; return FALSE;
dpy = decode->display; dpy = GST_VAAPI_PLUGIN_BASE_DISPLAY(decode);
switch (gst_vaapi_codec_from_caps(caps)) { switch (gst_vaapi_codec_from_caps(caps)) {
case GST_VAAPI_CODEC_MPEG2: case GST_VAAPI_CODEC_MPEG2:
@ -716,12 +717,11 @@ gst_vaapidecode_finalize(GObject *object)
gst_caps_replace(&decode->srcpad_caps, NULL); gst_caps_replace(&decode->srcpad_caps, NULL);
gst_caps_replace(&decode->allowed_caps, NULL); gst_caps_replace(&decode->allowed_caps, NULL);
gst_vaapi_display_replace(&decode->display, NULL);
g_cond_clear(&decode->decoder_finish_done); g_cond_clear(&decode->decoder_finish_done);
g_cond_clear(&decode->decoder_ready); g_cond_clear(&decode->decoder_ready);
g_mutex_clear(&decode->decoder_mutex); g_mutex_clear(&decode->decoder_mutex);
gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
G_OBJECT_CLASS(gst_vaapidecode_parent_class)->finalize(object); G_OBJECT_CLASS(gst_vaapidecode_parent_class)->finalize(object);
} }
@ -729,15 +729,18 @@ static gboolean
gst_vaapidecode_open(GstVideoDecoder *vdec) gst_vaapidecode_open(GstVideoDecoder *vdec)
{ {
GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec); GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
GstVaapiDisplay * const old_display = decode->display; GstVaapiDisplay * const old_display = GST_VAAPI_PLUGIN_BASE_DISPLAY(decode);
gboolean success; gboolean success;
if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(decode)))
return FALSE;
/* Let GstVideoContext ask for a proper display to its neighbours */ /* Let GstVideoContext ask for a proper display to its neighbours */
/* Note: steal old display that may be allocated from get_caps() /* Note: steal old display that may be allocated from get_caps()
so that to retain a reference to it, thus avoiding extra so that to retain a reference to it, thus avoiding extra
initialization steps if we turn out to simply re-use the initialization steps if we turn out to simply re-use the
existing (cached) VA display */ existing (cached) VA display */
decode->display = NULL; GST_VAAPI_PLUGIN_BASE_DISPLAY(decode) = NULL;
success = gst_vaapidecode_ensure_display(decode); success = gst_vaapidecode_ensure_display(decode);
if (old_display) if (old_display)
gst_vaapi_display_unref(old_display); gst_vaapi_display_unref(old_display);
@ -750,7 +753,7 @@ gst_vaapidecode_close(GstVideoDecoder *vdec)
GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec); GstVaapiDecode * const decode = GST_VAAPIDECODE(vdec);
gst_vaapidecode_destroy(decode); gst_vaapidecode_destroy(decode);
gst_vaapi_display_replace(&decode->display, NULL); gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(decode));
return TRUE; return TRUE;
} }
@ -835,6 +838,8 @@ gst_vaapidecode_class_init(GstVaapiDecodeClass *klass)
GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidecode, GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidecode,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
object_class->finalize = gst_vaapidecode_finalize; object_class->finalize = gst_vaapidecode_finalize;
vdec_class->open = GST_DEBUG_FUNCPTR(gst_vaapidecode_open); vdec_class->open = GST_DEBUG_FUNCPTR(gst_vaapidecode_open);
@ -881,7 +886,8 @@ gst_vaapidecode_ensure_allowed_caps(GstVaapiDecode *decode)
if (!gst_vaapidecode_ensure_display(decode)) if (!gst_vaapidecode_ensure_display(decode))
goto error_no_display; goto error_no_display;
decode_caps = gst_vaapi_display_get_decode_caps(decode->display); decode_caps = gst_vaapi_display_get_decode_caps(
GST_VAAPI_PLUGIN_BASE_DISPLAY(decode));
if (!decode_caps) if (!decode_caps)
goto error_no_decode_caps; goto error_no_decode_caps;
n_decode_caps = gst_caps_get_size(decode_caps); n_decode_caps = gst_caps_get_size(decode_caps);
@ -945,8 +951,8 @@ gst_vaapidecode_query(GST_PAD_QUERY_FUNCTION_ARGS)
GST_INFO_OBJECT(decode, "query type %s", GST_QUERY_TYPE_NAME(query)); GST_INFO_OBJECT(decode, "query type %s", GST_QUERY_TYPE_NAME(query));
if (gst_vaapi_reply_to_query(query, decode->display)) { if (gst_vaapi_reply_to_query(query, GST_VAAPI_PLUGIN_BASE_DISPLAY(decode))) {
GST_DEBUG("sharing display %p", decode->display); GST_DEBUG("sharing display %p", GST_VAAPI_PLUGIN_BASE_DISPLAY(decode));
res = TRUE; res = TRUE;
} }
else if (GST_PAD_IS_SINK(pad)) { else if (GST_PAD_IS_SINK(pad)) {
@ -979,7 +985,8 @@ gst_vaapidecode_init(GstVaapiDecode *decode)
{ {
GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode); GstVideoDecoder * const vdec = GST_VIDEO_DECODER(decode);
decode->display = NULL; gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(decode), GST_CAT_DEFAULT);
decode->decoder = NULL; decode->decoder = NULL;
decode->decoder_caps = NULL; decode->decoder_caps = NULL;
decode->allowed_caps = NULL; decode->allowed_caps = NULL;

10
gst/vaapi/gstvaapidecode.h
View file

@ -25,10 +25,7 @@
#ifndef GST_VAAPIDECODE_H #ifndef GST_VAAPIDECODE_H
#define GST_VAAPIDECODE_H #define GST_VAAPIDECODE_H
#include <gst/gst.h> #include "gstvaapipluginbase.h"
#include <gst/gsttask.h>
#include <gst/video/gstvideodecoder.h>
#include <gst/vaapi/gstvaapidisplay.h>
#include <gst/vaapi/gstvaapidecoder.h> #include <gst/vaapi/gstvaapidecoder.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -62,7 +59,7 @@ typedef struct _GstVaapiDecodeClass GstVaapiDecodeClass;
struct _GstVaapiDecode { struct _GstVaapiDecode {
/*< private >*/ /*< private >*/
GstVideoDecoder parent_instance; GstVaapiPluginBase parent_instance;
GstPad *sinkpad; GstPad *sinkpad;
GstCaps *sinkpad_caps; GstCaps *sinkpad_caps;
@ -70,7 +67,6 @@ struct _GstVaapiDecode {
GstPad *srcpad; GstPad *srcpad;
GstCaps *srcpad_caps; GstCaps *srcpad_caps;
GstPadQueryFunction srcpad_query; GstPadQueryFunction srcpad_query;
GstVaapiDisplay *display;
GstVaapiDecoder *decoder; GstVaapiDecoder *decoder;
GMutex decoder_mutex; GMutex decoder_mutex;
GCond decoder_ready; GCond decoder_ready;
@ -85,7 +81,7 @@ struct _GstVaapiDecode {
struct _GstVaapiDecodeClass { struct _GstVaapiDecodeClass {
/*< private >*/ /*< private >*/
GstVideoDecoderClass parent_class; GstVaapiPluginBaseClass parent_class;
}; };
GType GType

34
gst/vaapi/gstvaapidownload.c
View file

@ -75,9 +75,8 @@ struct _TransformSizeCache {
struct _GstVaapiDownload { struct _GstVaapiDownload {
/*< private >*/ /*< private >*/
GstBaseTransform parent_instance; GstVaapiPluginBase parent_instance;
GstVaapiDisplay *display;
GstCaps *allowed_caps; GstCaps *allowed_caps;
TransformSizeCache transform_size_cache[2]; TransformSizeCache transform_size_cache[2];
GstVaapiVideoPool *images; GstVaapiVideoPool *images;
@ -89,7 +88,7 @@ struct _GstVaapiDownload {
struct _GstVaapiDownloadClass { struct _GstVaapiDownloadClass {
/*< private >*/ /*< private >*/
GstBaseTransformClass parent_class; GstVaapiPluginBaseClass parent_class;
}; };
/* GstImplementsInterface interface */ /* GstImplementsInterface interface */
@ -114,7 +113,7 @@ gst_vaapidownload_set_video_context(GstVideoContext *context, const gchar *type,
const GValue *value) const GValue *value)
{ {
GstVaapiDownload *download = GST_VAAPIDOWNLOAD (context); GstVaapiDownload *download = GST_VAAPIDOWNLOAD (context);
gst_vaapi_set_display (type, value, &download->display); gst_vaapi_set_display (type, value, &GST_VAAPI_PLUGIN_BASE_DISPLAY(download));
} }
static void static void
@ -199,7 +198,7 @@ gst_vaapidownload_destroy(GstVaapiDownload *download)
} }
gst_vaapi_video_pool_replace(&download->images, NULL); gst_vaapi_video_pool_replace(&download->images, NULL);
gst_vaapi_display_replace(&download->display, NULL); GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(download, NULL);
} }
static void static void
@ -207,6 +206,7 @@ gst_vaapidownload_finalize(GObject *object)
{ {
gst_vaapidownload_destroy(GST_VAAPIDOWNLOAD(object)); gst_vaapidownload_destroy(GST_VAAPIDOWNLOAD(object));
gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
G_OBJECT_CLASS(gst_vaapidownload_parent_class)->finalize(object); G_OBJECT_CLASS(gst_vaapidownload_parent_class)->finalize(object);
} }
@ -221,6 +221,8 @@ gst_vaapidownload_class_init(GstVaapiDownloadClass *klass)
GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidownload, GST_DEBUG_CATEGORY_INIT(gst_debug_vaapidownload,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
object_class->finalize = gst_vaapidownload_finalize; object_class->finalize = gst_vaapidownload_finalize;
trans_class->start = gst_vaapidownload_start; trans_class->start = gst_vaapidownload_start;
trans_class->stop = gst_vaapidownload_stop; trans_class->stop = gst_vaapidownload_stop;
@ -250,7 +252,8 @@ gst_vaapidownload_init(GstVaapiDownload *download)
{ {
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
download->display = NULL; gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(download), GST_CAT_DEFAULT);
download->allowed_caps = NULL; download->allowed_caps = NULL;
download->images = NULL; download->images = NULL;
download->images_reset = FALSE; download->images_reset = FALSE;
@ -273,7 +276,7 @@ static inline gboolean
gst_vaapidownload_ensure_display(GstVaapiDownload *download) gst_vaapidownload_ensure_display(GstVaapiDownload *download)
{ {
return gst_vaapi_ensure_display(download, GST_VAAPI_DISPLAY_TYPE_ANY, return gst_vaapi_ensure_display(download, GST_VAAPI_DISPLAY_TYPE_ANY,
&download->display); &GST_VAAPI_PLUGIN_BASE_DISPLAY(download));
} }
static gboolean static gboolean
@ -281,6 +284,8 @@ gst_vaapidownload_start(GstBaseTransform *trans)
{ {
GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans); GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans);
if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(trans)))
return FALSE;
if (!gst_vaapidownload_ensure_display(download)) if (!gst_vaapidownload_ensure_display(download))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -289,9 +294,7 @@ gst_vaapidownload_start(GstBaseTransform *trans)
static gboolean static gboolean
gst_vaapidownload_stop(GstBaseTransform *trans) gst_vaapidownload_stop(GstBaseTransform *trans)
{ {
GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(trans); gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(trans));
gst_vaapi_display_replace(&download->display, NULL);
return TRUE; return TRUE;
} }
@ -443,7 +446,8 @@ gst_vaapidownload_transform_caps(
if (download->allowed_caps) if (download->allowed_caps)
allowed_caps = gst_caps_ref(download->allowed_caps); allowed_caps = gst_caps_ref(download->allowed_caps);
else { else {
allowed_caps = gst_vaapi_display_get_image_caps(download->display); allowed_caps = gst_vaapi_display_get_image_caps(
GST_VAAPI_PLUGIN_BASE_DISPLAY(download));
if (!allowed_caps) if (!allowed_caps)
return NULL; return NULL;
} }
@ -504,7 +508,8 @@ gst_vaapidownload_ensure_image_pool(GstVaapiDownload *download, GstCaps *caps)
download->image_width = width; download->image_width = width;
download->image_height = height; download->image_height = height;
gst_vaapi_video_pool_replace(&download->images, NULL); gst_vaapi_video_pool_replace(&download->images, NULL);
download->images = gst_vaapi_image_pool_new(download->display, &vi); download->images = gst_vaapi_image_pool_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(download), &vi);
if (!download->images) if (!download->images)
return FALSE; return FALSE;
download->images_reset = TRUE; download->images_reset = TRUE;
@ -587,11 +592,12 @@ static gboolean
gst_vaapidownload_query(GstPad *pad, GstQuery *query) gst_vaapidownload_query(GstPad *pad, GstQuery *query)
{ {
GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(gst_pad_get_parent_element(pad)); GstVaapiDownload * const download = GST_VAAPIDOWNLOAD(gst_pad_get_parent_element(pad));
GstVaapiDisplay * const display = GST_VAAPI_PLUGIN_BASE_DISPLAY(download);
gboolean res; gboolean res;
GST_DEBUG("sharing display %p", download->display); GST_DEBUG("sharing display %p", display);
if (gst_vaapi_reply_to_query(query, download->display)) if (gst_vaapi_reply_to_query(query, display))
res = TRUE; res = TRUE;
else else
res = gst_pad_query_default(pad, query); res = gst_pad_query_default(pad, query);

3
gst/vaapi/gstvaapidownload.h
View file

@ -25,8 +25,7 @@
#ifndef GST_VAAPIDOWNLOAD_H #ifndef GST_VAAPIDOWNLOAD_H
#define GST_VAAPIDOWNLOAD_H #define GST_VAAPIDOWNLOAD_H
#include <gst/base/gstbasetransform.h> #include "gstvaapipluginbase.h"
#include <gst/vaapi/gstvaapidisplay.h>
#include <gst/vaapi/gstvaapisurface.h> #include <gst/vaapi/gstvaapisurface.h>
#include <gst/vaapi/gstvaapiimagepool.h> #include <gst/vaapi/gstvaapiimagepool.h>
#include <gst/vaapi/gstvaapisurfacepool.h> #include <gst/vaapi/gstvaapisurfacepool.h>

38
gst/vaapi/gstvaapiencode.c
View file

@ -68,7 +68,7 @@ gst_vaapiencode_set_context (GstElement * element, GstContext * context)
if (gst_vaapi_video_context_get_display (context, &display)) { if (gst_vaapi_video_context_get_display (context, &display)) {
GST_INFO_OBJECT (element, "set display %p", display); GST_INFO_OBJECT (element, "set display %p", display);
gst_vaapi_display_replace (&encode->display, display); GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE (encode, display);
gst_vaapi_display_unref (display); gst_vaapi_display_unref (display);
} }
} }
@ -79,7 +79,7 @@ gst_vaapiencode_set_video_context (GstVideoContext * context,
{ {
GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (context); GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (context);
gst_vaapi_set_display (type, value, &encode->display); gst_vaapi_set_display (type, value, &GST_VAAPI_PLUGIN_BASE_DISPLAY (encode));
} }
static void static void
@ -114,7 +114,7 @@ static inline gboolean
ensure_display (GstVaapiEncode * encode) ensure_display (GstVaapiEncode * encode)
{ {
return gst_vaapi_ensure_display (encode, return gst_vaapi_ensure_display (encode,
GST_VAAPI_DISPLAY_TYPE_ANY, &encode->display); GST_VAAPI_DISPLAY_TYPE_ANY, &GST_VAAPI_PLUGIN_BASE_DISPLAY (encode));
} }
static gboolean static gboolean
@ -125,12 +125,14 @@ ensure_uploader (GstVaapiEncode * encode)
return FALSE; return FALSE;
if (!encode->uploader) { if (!encode->uploader) {
encode->uploader = gst_vaapi_uploader_new (encode->display); encode->uploader = gst_vaapi_uploader_new (
GST_VAAPI_PLUGIN_BASE_DISPLAY (encode));
if (!encode->uploader) if (!encode->uploader)
return FALSE; return FALSE;
} }
if (!gst_vaapi_uploader_ensure_display (encode->uploader, encode->display)) if (!gst_vaapi_uploader_ensure_display (encode->uploader,
GST_VAAPI_PLUGIN_BASE_DISPLAY (encode)))
return FALSE; return FALSE;
#endif #endif
return TRUE; return TRUE;
@ -157,7 +159,7 @@ gst_vaapiencode_query (GST_PAD_QUERY_FUNCTION_ARGS)
GST_INFO_OBJECT (encode, "query type %s", GST_QUERY_TYPE_NAME (query)); GST_INFO_OBJECT (encode, "query type %s", GST_QUERY_TYPE_NAME (query));
if (gst_vaapi_reply_to_query (query, encode->display)) if (gst_vaapi_reply_to_query (query, GST_VAAPI_PLUGIN_BASE_DISPLAY (encode)))
success = TRUE; success = TRUE;
else if (GST_PAD_IS_SINK (pad)) else if (GST_PAD_IS_SINK (pad))
success = GST_PAD_QUERY_FUNCTION_CALL (encode->sinkpad_query, success = GST_PAD_QUERY_FUNCTION_CALL (encode->sinkpad_query,
@ -379,7 +381,6 @@ gst_vaapiencode_destroy (GstVaapiEncode * encode)
g_clear_object (&encode->uploader); g_clear_object (&encode->uploader);
gst_caps_replace (&encode->sinkpad_caps, NULL); gst_caps_replace (&encode->sinkpad_caps, NULL);
gst_caps_replace (&encode->srcpad_caps, NULL); gst_caps_replace (&encode->srcpad_caps, NULL);
gst_vaapi_display_replace (&encode->display, NULL);
return TRUE; return TRUE;
} }
@ -397,7 +398,8 @@ ensure_encoder (GstVaapiEncode * encode)
if (!ensure_uploader_caps (encode)) if (!ensure_uploader_caps (encode))
return FALSE; return FALSE;
encode->encoder = klass->create_encoder (encode, encode->display); encode->encoder = klass->create_encoder (encode,
GST_VAAPI_PLUGIN_BASE_DISPLAY (encode));
if (!encode->encoder) if (!encode->encoder)
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -407,10 +409,13 @@ static gboolean
gst_vaapiencode_open (GstVideoEncoder * venc) gst_vaapiencode_open (GstVideoEncoder * venc)
{ {
GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (venc); GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (venc);
GstVaapiDisplay *const old_display = encode->display; GstVaapiDisplay *const old_display = GST_VAAPI_PLUGIN_BASE_DISPLAY (encode);
gboolean success; gboolean success;
encode->display = NULL; if (!gst_vaapi_plugin_base_open (GST_VAAPI_PLUGIN_BASE (encode)))
return FALSE;
GST_VAAPI_PLUGIN_BASE_DISPLAY (encode) = NULL;
success = ensure_display (encode); success = ensure_display (encode);
if (old_display) if (old_display)
gst_vaapi_display_unref (old_display); gst_vaapi_display_unref (old_display);
@ -422,7 +427,9 @@ gst_vaapiencode_close (GstVideoEncoder * venc)
{ {
GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (venc); GstVaapiEncode *const encode = GST_VAAPIENCODE_CAST (venc);
return gst_vaapiencode_destroy (encode); gst_vaapiencode_destroy (encode);
gst_vaapi_plugin_base_close (GST_VAAPI_PLUGIN_BASE (encode));
return TRUE;
} }
static inline gboolean static inline gboolean
@ -436,7 +443,7 @@ gst_vaapiencode_update_sink_caps (GstVaapiEncode * encode,
if (GST_VIDEO_INFO_IS_YUV (&encode->sink_video_info)) { if (GST_VIDEO_INFO_IS_YUV (&encode->sink_video_info)) {
/* Ensure the uploader is set up for upstream allocated buffers */ /* Ensure the uploader is set up for upstream allocated buffers */
GstVaapiUploader *const uploader = encode->uploader; GstVaapiUploader *const uploader = encode->uploader;
if (!gst_vaapi_uploader_ensure_display (uploader, encode->display)) if (!gst_vaapi_uploader_ensure_display (uploader, GST_VAAPI_PLUGIN_BASE_DISPLAY (encode)))
return FALSE; return FALSE;
if (!gst_vaapi_uploader_ensure_caps (uploader, state->caps, NULL)) if (!gst_vaapi_uploader_ensure_caps (uploader, state->caps, NULL))
return FALSE; return FALSE;
@ -527,7 +534,7 @@ gst_vaapiencode_ensure_video_buffer_pool (GstVaapiEncode * encode,
encode->video_buffer_size = 0; encode->video_buffer_size = 0;
} }
pool = gst_vaapi_video_buffer_pool_new (encode->display); pool = gst_vaapi_video_buffer_pool_new (GST_VAAPI_PLUGIN_BASE_DISPLAY (encode));
if (!pool) if (!pool)
goto error_create_pool; goto error_create_pool;
@ -903,12 +910,15 @@ gst_vaapiencode_finalize (GObject * object)
encode->sinkpad = NULL; encode->sinkpad = NULL;
encode->srcpad = NULL; encode->srcpad = NULL;
gst_vaapi_plugin_base_finalize (GST_VAAPI_PLUGIN_BASE (object));
G_OBJECT_CLASS (gst_vaapiencode_parent_class)->finalize (object); G_OBJECT_CLASS (gst_vaapiencode_parent_class)->finalize (object);
} }
static void static void
gst_vaapiencode_init (GstVaapiEncode * encode) gst_vaapiencode_init (GstVaapiEncode * encode)
{ {
gst_vaapi_plugin_base_init (GST_VAAPI_PLUGIN_BASE (encode), GST_CAT_DEFAULT);
/* sink pad */ /* sink pad */
encode->sinkpad = GST_VIDEO_ENCODER_SINK_PAD (encode); encode->sinkpad = GST_VIDEO_ENCODER_SINK_PAD (encode);
encode->sinkpad_query = GST_PAD_QUERYFUNC (encode->sinkpad); encode->sinkpad_query = GST_PAD_QUERYFUNC (encode->sinkpad);
@ -935,6 +945,8 @@ gst_vaapiencode_class_init (GstVaapiEncodeClass * klass)
GST_DEBUG_CATEGORY_INIT (gst_vaapiencode_debug, GST_DEBUG_CATEGORY_INIT (gst_vaapiencode_debug,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
gst_vaapi_plugin_base_class_init (GST_VAAPI_PLUGIN_BASE_CLASS (klass));
object_class->finalize = gst_vaapiencode_finalize; object_class->finalize = gst_vaapiencode_finalize;
object_class->set_property = gst_vaapiencode_set_property; object_class->set_property = gst_vaapiencode_set_property;
object_class->get_property = gst_vaapiencode_get_property; object_class->get_property = gst_vaapiencode_get_property;

8
gst/vaapi/gstvaapiencode.h
View file

@ -22,8 +22,7 @@
#ifndef GST_VAAPIENCODE_H #ifndef GST_VAAPIENCODE_H
#define GST_VAAPIENCODE_H #define GST_VAAPIENCODE_H
#include <gst/gst.h> #include "gstvaapipluginbase.h"
#include <gst/video/gstvideoencoder.h>
#include <gst/vaapi/gstvaapiencoder.h> #include <gst/vaapi/gstvaapiencoder.h>
#include "gstvaapiuploader.h" #include "gstvaapiuploader.h"
@ -50,7 +49,7 @@ typedef struct _GstVaapiEncodeClass GstVaapiEncodeClass;
struct _GstVaapiEncode struct _GstVaapiEncode
{ {
/*< private >*/ /*< private >*/
GstVideoEncoder parent_instance; GstVaapiPluginBase parent_instance;
GstPad *sinkpad; GstPad *sinkpad;
GstCaps *sinkpad_caps; GstCaps *sinkpad_caps;
@ -61,7 +60,6 @@ struct _GstVaapiEncode
GstCaps *srcpad_caps; GstCaps *srcpad_caps;
GstPadQueryFunction srcpad_query; GstPadQueryFunction srcpad_query;
GstVaapiDisplay *display;
GstVaapiEncoder *encoder; GstVaapiEncoder *encoder;
GstVaapiUploader *uploader; GstVaapiUploader *uploader;
@ -79,7 +77,7 @@ struct _GstVaapiEncode
struct _GstVaapiEncodeClass struct _GstVaapiEncodeClass
{ {
/*< private >*/ /*< private >*/
GstVideoEncoderClass parent_class; GstVaapiPluginBaseClass parent_class;
gboolean (*check_ratecontrol) (GstVaapiEncode * encode, gboolean (*check_ratecontrol) (GstVaapiEncode * encode,
GstVaapiRateControl rate_control); GstVaapiRateControl rate_control);

76
gst/vaapi/gstvaapipluginbase.c Normal file
View file

@ -0,0 +1,76 @@
/*
* gstvaapipluginbase.c - Base GStreamer VA-API Plugin element
*
* Copyright (C) 2010-2011 Splitted-Desktop Systems
* Author: Gwenole Beauchesne <gwenole.beauchesne@splitted-desktop.com>
* Copyright (C) 2011-2013 Intel Corporation
* Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
#include "gst/vaapi/sysdeps.h"
#include "gstvaapipluginbase.h"
#define GST_CAT_DEFAULT (plugin->debug_category)
void
gst_vaapi_plugin_base_class_init (GstVaapiPluginBaseClass * klass)
{
}
void
gst_vaapi_plugin_base_init (GstVaapiPluginBase * plugin,
GstDebugCategory * debug_category)
{
plugin->debug_category = debug_category;
}
void
gst_vaapi_plugin_base_finalize (GstVaapiPluginBase * plugin)
{
gst_vaapi_plugin_base_close (plugin);
gst_debug_category_free (plugin->debug_category);
}
/**
* gst_vaapi_plugin_base_open:
* @plugin: a #GstVaapiPluginBase
*
* Allocates any internal resources needed for correct operation from
* the subclass.
*
* Returns: %TRUE if successful, %FALSE otherwise.
*/
gboolean
gst_vaapi_plugin_base_open (GstVaapiPluginBase * plugin)
{
return TRUE;
}
/**
* gst_vaapi_plugin_base_close:
* @plugin: a #GstVaapiPluginBase
*
* Deallocates all internal resources that were allocated so
* far. i.e. put the base plugin object into a clean state.
*/
void
gst_vaapi_plugin_base_close (GstVaapiPluginBase * plugin)
{
gst_vaapi_display_replace (&plugin->display, NULL);
}

130
gst/vaapi/gstvaapipluginbase.h Normal file
View file

@ -0,0 +1,130 @@
/*
* gstvaapipluginbase.h - Base GStreamer VA-API Plugin element
*
* Copyright (C) 2010-2011 Splitted-Desktop Systems
* Author: Gwenole Beauchesne <gwenole.beauchesne@splitted-desktop.com>
* Copyright (C) 2011-2013 Intel Corporation
* Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA
*/
#ifndef GST_VAAPI_PLUGIN_BASE_H
#define GST_VAAPI_PLUGIN_BASE_H
#include <gst/base/gstbasetransform.h>
#include <gst/video/gstvideodecoder.h>
#include <gst/video/gstvideoencoder.h>
#include <gst/video/gstvideosink.h>
#include <gst/vaapi/gstvaapidisplay.h>
G_BEGIN_DECLS
typedef struct _GstVaapiPluginBase GstVaapiPluginBase;
typedef struct _GstVaapiPluginBaseClass GstVaapiPluginBaseClass;
#define GST_VAAPI_PLUGIN_BASE(plugin) \
((GstVaapiPluginBase *)(plugin))
#define GST_VAAPI_PLUGIN_BASE_CLASS(plugin) \
((GstVaapiPluginBaseClass *)(plugin))
#define GST_VAAPI_PLUGIN_BASE_GET_CLASS(plugin) \
GST_VAAPI_PLUGIN_BASE_CLASS(GST_ELEMENT_GET_CLASS( \
GST_VAAPI_PLUGIN_BASE_ELEMENT(plugin)))
#define GST_VAAPI_PLUGIN_BASE_PARENT(plugin) \
(&GST_VAAPI_PLUGIN_BASE(plugin)->parent_instance)
#define GST_VAAPI_PLUGIN_BASE_PARENT_CLASS(plugin) \
(&GST_VAAPI_PLUGIN_BASE_CLASS(plugin)->parent_class)
#define GST_VAAPI_PLUGIN_BASE_ELEMENT(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT(plugin)->element)
#define GST_VAAPI_PLUGIN_BASE_ELEMENT_CLASS(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT_CLASS(plugin)->element)
#define GST_VAAPI_PLUGIN_BASE_DECODER(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT(plugin)->decoder)
#define GST_VAAPI_PLUGIN_BASE_DECODER_CLASS(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT_CLASS(plugin)->decoder)
#define GST_VAAPI_PLUGIN_BASE_ENCODER(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT(plugin)->encoder)
#define GST_VAAPI_PLUGIN_BASE_ENCODER_CLASS(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT_CLASS(plugin)->encoder)
#define GST_VAAPI_PLUGIN_BASE_TRANSFORM(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT(plugin)->transform)
#define GST_VAAPI_PLUGIN_BASE_TRANSFORM_CLASS(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT_CLASS(plugin)->transform)
#define GST_VAAPI_PLUGIN_BASE_SINK(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT(plugin)->sink)
#define GST_VAAPI_PLUGIN_BASE_SINK_CLASS(plugin) \
(&GST_VAAPI_PLUGIN_BASE_PARENT_CLASS(plugin)->sink)
#define GST_VAAPI_PLUGIN_BASE_DISPLAY(plugin) \
(GST_VAAPI_PLUGIN_BASE(plugin)->display)
#define GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(plugin, new_display) \
(gst_vaapi_display_replace(&GST_VAAPI_PLUGIN_BASE_DISPLAY(plugin), \
(new_display)))
struct _GstVaapiPluginBase
{
/*< private >*/
union
{
GstElement element;
GstVideoDecoder decoder;
GstVideoEncoder encoder;
GstBaseTransform transform;
GstVideoSink sink;
} parent_instance;
GstDebugCategory *debug_category;
GstVaapiDisplay *display;
};
struct _GstVaapiPluginBaseClass
{
/*< private >*/
union
{
GstElementClass element;
GstVideoDecoderClass decoder;
GstVideoEncoderClass encoder;
GstBaseTransformClass transform;
GstVideoSinkClass sink;
} parent_class;
};
G_GNUC_INTERNAL
void
gst_vaapi_plugin_base_class_init (GstVaapiPluginBaseClass * klass);
G_GNUC_INTERNAL
void
gst_vaapi_plugin_base_init (GstVaapiPluginBase * plugin,
GstDebugCategory * debug_category);
G_GNUC_INTERNAL
void
gst_vaapi_plugin_base_finalize (GstVaapiPluginBase * plugin);
G_GNUC_INTERNAL
gboolean
gst_vaapi_plugin_base_open (GstVaapiPluginBase * plugin);
G_GNUC_INTERNAL
void
gst_vaapi_plugin_base_close (GstVaapiPluginBase * plugin);
G_END_DECLS
#endif /* GST_VAAPI_PLUGIN_BASE_H */

40
gst/vaapi/gstvaapipostproc.c
View file

@ -118,10 +118,10 @@ gst_vaapipostproc_set_video_context(
{ {
GstVaapiPostproc * const postproc = GST_VAAPIPOSTPROC(context); GstVaapiPostproc * const postproc = GST_VAAPIPOSTPROC(context);
gst_vaapi_set_display(type, value, &postproc->display); gst_vaapi_set_display(type, value, &GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
if (postproc->uploader) if (postproc->uploader)
gst_vaapi_uploader_ensure_display(postproc->uploader, postproc->display); gst_vaapi_uploader_ensure_display(postproc->uploader, GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
} }
static void static void
@ -263,7 +263,7 @@ gst_vaapipostproc_set_context(GstElement *element, GstContext *context)
if (gst_vaapi_video_context_get_display(context, &display)) { if (gst_vaapi_video_context_get_display(context, &display)) {
GST_INFO_OBJECT(element, "set display %p", display); GST_INFO_OBJECT(element, "set display %p", display);
gst_vaapi_display_replace(&postproc->display, display); GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(postproc, display);
gst_vaapi_display_unref(display); gst_vaapi_display_unref(display);
} }
} }
@ -273,7 +273,7 @@ static inline gboolean
gst_vaapipostproc_ensure_display(GstVaapiPostproc *postproc) gst_vaapipostproc_ensure_display(GstVaapiPostproc *postproc)
{ {
return gst_vaapi_ensure_display(postproc, GST_VAAPI_DISPLAY_TYPE_ANY, return gst_vaapi_ensure_display(postproc, GST_VAAPI_DISPLAY_TYPE_ANY,
&postproc->display); &GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
} }
static gboolean static gboolean
@ -283,13 +283,14 @@ gst_vaapipostproc_ensure_uploader(GstVaapiPostproc *postproc)
return FALSE; return FALSE;
if (!postproc->uploader) { if (!postproc->uploader) {
postproc->uploader = gst_vaapi_uploader_new(postproc->display); postproc->uploader = gst_vaapi_uploader_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
if (!postproc->uploader) if (!postproc->uploader)
return FALSE; return FALSE;
} }
if (!gst_vaapi_uploader_ensure_display(postproc->uploader, if (!gst_vaapi_uploader_ensure_display(postproc->uploader,
postproc->display)) GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc)))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
@ -314,7 +315,8 @@ gst_vaapipostproc_ensure_filter(GstVaapiPostproc *postproc)
if (!gst_vaapipostproc_ensure_display(postproc)) if (!gst_vaapipostproc_ensure_display(postproc))
return FALSE; return FALSE;
postproc->filter = gst_vaapi_filter_new(postproc->display); postproc->filter = gst_vaapi_filter_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
if (!postproc->filter) if (!postproc->filter)
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -339,6 +341,8 @@ gst_vaapipostproc_ensure_filter_caps(GstVaapiPostproc *postproc)
static gboolean static gboolean
gst_vaapipostproc_create(GstVaapiPostproc *postproc) gst_vaapipostproc_create(GstVaapiPostproc *postproc)
{ {
if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(postproc)))
return FALSE;
if (!gst_vaapipostproc_ensure_display(postproc)) if (!gst_vaapipostproc_ensure_display(postproc))
return FALSE; return FALSE;
if (!gst_vaapipostproc_ensure_uploader(postproc)) if (!gst_vaapipostproc_ensure_uploader(postproc))
@ -375,12 +379,12 @@ gst_vaapipostproc_destroy(GstVaapiPostproc *postproc)
#endif #endif
g_clear_object(&postproc->uploader); g_clear_object(&postproc->uploader);
gst_vaapipostproc_destroy_filter(postproc); gst_vaapipostproc_destroy_filter(postproc);
gst_vaapi_display_replace(&postproc->display, NULL);
gst_caps_replace(&postproc->allowed_sinkpad_caps, NULL); gst_caps_replace(&postproc->allowed_sinkpad_caps, NULL);
gst_caps_replace(&postproc->sinkpad_caps, NULL); gst_caps_replace(&postproc->sinkpad_caps, NULL);
gst_caps_replace(&postproc->allowed_srcpad_caps, NULL); gst_caps_replace(&postproc->allowed_srcpad_caps, NULL);
gst_caps_replace(&postproc->srcpad_caps, NULL); gst_caps_replace(&postproc->srcpad_caps, NULL);
gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(postproc));
} }
static gboolean static gboolean
@ -389,6 +393,8 @@ gst_vaapipostproc_start(GstBaseTransform *trans)
GstVaapiPostproc * const postproc = GST_VAAPIPOSTPROC(trans); GstVaapiPostproc * const postproc = GST_VAAPIPOSTPROC(trans);
ds_reset(&postproc->deinterlace_state); ds_reset(&postproc->deinterlace_state);
if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(postproc)))
return FALSE;
if (!gst_vaapipostproc_ensure_display(postproc)) if (!gst_vaapipostproc_ensure_display(postproc))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -400,7 +406,7 @@ gst_vaapipostproc_stop(GstBaseTransform *trans)
GstVaapiPostproc * const postproc = GST_VAAPIPOSTPROC(trans); GstVaapiPostproc * const postproc = GST_VAAPIPOSTPROC(trans);
ds_reset(&postproc->deinterlace_state); ds_reset(&postproc->deinterlace_state);
gst_vaapi_display_replace(&postproc->display, NULL); gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(postproc));
return TRUE; return TRUE;
} }
@ -859,7 +865,7 @@ gst_vaapipostproc_update_sink_caps(GstVaapiPostproc *postproc, GstCaps *caps,
if (postproc->is_raw_yuv) { if (postproc->is_raw_yuv) {
/* Ensure the uploader is set up for upstream allocated buffers */ /* Ensure the uploader is set up for upstream allocated buffers */
GstVaapiUploader * const uploader = postproc->uploader; GstVaapiUploader * const uploader = postproc->uploader;
if (!gst_vaapi_uploader_ensure_display(uploader, postproc->display)) if (!gst_vaapi_uploader_ensure_display(uploader, GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc)))
return FALSE; return FALSE;
if (!gst_vaapi_uploader_ensure_caps(uploader, caps, NULL)) if (!gst_vaapi_uploader_ensure_caps(uploader, caps, NULL))
return FALSE; return FALSE;
@ -1360,7 +1366,8 @@ ensure_sinkpad_buffer_pool(GstVaapiPostproc *postproc, GstCaps *caps)
postproc->sinkpad_buffer_size = 0; postproc->sinkpad_buffer_size = 0;
} }
pool = gst_vaapi_video_buffer_pool_new(postproc->display); pool = gst_vaapi_video_buffer_pool_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
if (!pool) if (!pool)
goto error_create_pool; goto error_create_pool;
@ -1417,7 +1424,7 @@ ensure_srcpad_buffer_pool(GstVaapiPostproc *postproc, GstCaps *caps)
return TRUE; return TRUE;
postproc->filter_pool_info = vi; postproc->filter_pool_info = vi;
pool = gst_vaapi_surface_pool_new(postproc->display, pool = gst_vaapi_surface_pool_new(GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc),
&postproc->filter_pool_info); &postproc->filter_pool_info);
if (!pool) if (!pool)
return FALSE; return FALSE;
@ -1462,8 +1469,8 @@ gst_vaapipostproc_query(GstBaseTransform *trans, GstPadDirection direction,
GST_INFO_OBJECT(trans, "query type `%s'", GST_QUERY_TYPE_NAME(query)); GST_INFO_OBJECT(trans, "query type `%s'", GST_QUERY_TYPE_NAME(query));
if (gst_vaapi_reply_to_query(query, postproc->display)) { if (gst_vaapi_reply_to_query(query, GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc))) {
GST_DEBUG("sharing display %p", postproc->display); GST_DEBUG("sharing display %p", GST_VAAPI_PLUGIN_BASE_DISPLAY(postproc));
return TRUE; return TRUE;
} }
@ -1521,6 +1528,7 @@ gst_vaapipostproc_finalize(GObject *object)
gst_vaapipostproc_destroy(postproc); gst_vaapipostproc_destroy(postproc);
gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(postproc));
G_OBJECT_CLASS(gst_vaapipostproc_parent_class)->finalize(object); G_OBJECT_CLASS(gst_vaapipostproc_parent_class)->finalize(object);
} }
@ -1621,6 +1629,8 @@ gst_vaapipostproc_class_init(GstVaapiPostprocClass *klass)
GST_DEBUG_CATEGORY_INIT(gst_debug_vaapipostproc, GST_DEBUG_CATEGORY_INIT(gst_debug_vaapipostproc,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
object_class->finalize = gst_vaapipostproc_finalize; object_class->finalize = gst_vaapipostproc_finalize;
object_class->set_property = gst_vaapipostproc_set_property; object_class->set_property = gst_vaapipostproc_set_property;
object_class->get_property = gst_vaapipostproc_get_property; object_class->get_property = gst_vaapipostproc_get_property;
@ -1778,6 +1788,8 @@ gst_vaapipostproc_class_init(GstVaapiPostprocClass *klass)
static void static void
gst_vaapipostproc_init(GstVaapiPostproc *postproc) gst_vaapipostproc_init(GstVaapiPostproc *postproc)
{ {
gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(postproc), GST_CAT_DEFAULT);
postproc->format = DEFAULT_FORMAT; postproc->format = DEFAULT_FORMAT;
postproc->deinterlace_mode = DEFAULT_DEINTERLACE_MODE; postproc->deinterlace_mode = DEFAULT_DEINTERLACE_MODE;
postproc->deinterlace_method = DEFAULT_DEINTERLACE_METHOD; postproc->deinterlace_method = DEFAULT_DEINTERLACE_METHOD;

8
gst/vaapi/gstvaapipostproc.h
View file

@ -23,8 +23,7 @@
#ifndef GST_VAAPIPOSTPROC_H #ifndef GST_VAAPIPOSTPROC_H
#define GST_VAAPIPOSTPROC_H #define GST_VAAPIPOSTPROC_H
#include <gst/base/gstbasetransform.h> #include "gstvaapipluginbase.h"
#include <gst/vaapi/gstvaapidisplay.h>
#include <gst/vaapi/gstvaapisurface.h> #include <gst/vaapi/gstvaapisurface.h>
#include <gst/vaapi/gstvaapisurfacepool.h> #include <gst/vaapi/gstvaapisurfacepool.h>
#include <gst/vaapi/gstvaapifilter.h> #include <gst/vaapi/gstvaapifilter.h>
@ -135,9 +134,8 @@ struct _GstVaapiDeinterlaceState {
struct _GstVaapiPostproc { struct _GstVaapiPostproc {
/*< private >*/ /*< private >*/
GstBaseTransform parent_instance; GstVaapiPluginBase parent_instance;
GstVaapiDisplay *display;
GstVaapiUploader *uploader; GstVaapiUploader *uploader;
GstVaapiFilter *filter; GstVaapiFilter *filter;
GPtrArray *filter_ops; GPtrArray *filter_ops;
@ -177,7 +175,7 @@ struct _GstVaapiPostproc {
struct _GstVaapiPostprocClass { struct _GstVaapiPostprocClass {
/*< private >*/ /*< private >*/
GstBaseTransformClass parent_class; GstVaapiPluginBaseClass parent_class;
}; };
GType GType

94
gst/vaapi/gstvaapisink.c
View file

@ -133,7 +133,7 @@ gst_vaapisink_set_video_context(GstVideoContext *context, const gchar *type,
const GValue *value) const GValue *value)
{ {
GstVaapiSink *sink = GST_VAAPISINK (context); GstVaapiSink *sink = GST_VAAPISINK (context);
gst_vaapi_set_display (type, value, &sink->display); gst_vaapi_set_display (type, value, &GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
} }
static void static void
@ -272,10 +272,10 @@ gst_vaapisink_destroy(GstVaapiSink *sink)
#if USE_GLX #if USE_GLX
gst_vaapi_texture_replace(&sink->texture, NULL); gst_vaapi_texture_replace(&sink->texture, NULL);
#endif #endif
gst_vaapi_display_replace(&sink->display, NULL);
g_clear_object(&sink->uploader); g_clear_object(&sink->uploader);
gst_caps_replace(&sink->caps, NULL); gst_caps_replace(&sink->caps, NULL);
gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(sink));
} }
#if USE_X11 #if USE_X11
@ -313,6 +313,8 @@ configure_notify_event_pending(
guint height guint height
) )
{ {
GstVaapiDisplayX11 * const display =
GST_VAAPI_DISPLAY_X11(GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
ConfigureNotifyEventPendingArgs args; ConfigureNotifyEventPendingArgs args;
XEvent xev; XEvent xev;
@ -323,7 +325,7 @@ configure_notify_event_pending(
/* XXX: don't use XPeekIfEvent() because it might block */ /* XXX: don't use XPeekIfEvent() because it might block */
XCheckIfEvent( XCheckIfEvent(
gst_vaapi_display_x11_get_display(GST_VAAPI_DISPLAY_X11(sink->display)), gst_vaapi_display_x11_get_display(display),
&xev, &xev,
configure_notify_event_pending_cb, (XPointer)&args configure_notify_event_pending_cb, (XPointer)&args
); );
@ -347,24 +349,24 @@ gst_vaapisink_ensure_display(GstVaapiSink *sink)
{ {
GstVaapiDisplayType display_type; GstVaapiDisplayType display_type;
GstVaapiRenderMode render_mode; GstVaapiRenderMode render_mode;
const gboolean had_display = sink->display != NULL; const gboolean had_display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink) != NULL;
if (!gst_vaapi_ensure_display(sink, sink->display_type, &sink->display)) if (!gst_vaapi_ensure_display(sink, sink->display_type, &GST_VAAPI_PLUGIN_BASE_DISPLAY(sink)))
return FALSE; return FALSE;
display_type = gst_vaapi_display_get_display_type(sink->display); display_type = gst_vaapi_display_get_display_type(GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
if (display_type != sink->display_type || (!had_display && sink->display)) { if (display_type != sink->display_type || (!had_display && GST_VAAPI_PLUGIN_BASE_DISPLAY(sink))) {
GST_INFO("created %s %p", get_display_type_name(display_type), GST_INFO("created %s %p", get_display_type_name(display_type),
sink->display); GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
sink->display_type = display_type; sink->display_type = display_type;
sink->use_overlay = sink->use_overlay =
gst_vaapi_display_get_render_mode(sink->display, &render_mode) && gst_vaapi_display_get_render_mode(GST_VAAPI_PLUGIN_BASE_DISPLAY(sink), &render_mode) &&
render_mode == GST_VAAPI_RENDER_MODE_OVERLAY; render_mode == GST_VAAPI_RENDER_MODE_OVERLAY;
GST_DEBUG("use %s rendering mode", sink->use_overlay ? "overlay" : "texture"); GST_DEBUG("use %s rendering mode", sink->use_overlay ? "overlay" : "texture");
sink->use_rotation = gst_vaapi_display_has_property( sink->use_rotation = gst_vaapi_display_has_property(
sink->display, GST_VAAPI_DISPLAY_PROP_ROTATION); GST_VAAPI_PLUGIN_BASE_DISPLAY(sink), GST_VAAPI_DISPLAY_PROP_ROTATION);
} }
return TRUE; return TRUE;
} }
@ -376,7 +378,8 @@ gst_vaapisink_ensure_uploader(GstVaapiSink *sink)
return FALSE; return FALSE;
if (!sink->uploader) { if (!sink->uploader) {
sink->uploader = gst_vaapi_uploader_new(sink->display); sink->uploader = gst_vaapi_uploader_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
if (!sink->uploader) if (!sink->uploader)
return FALSE; return FALSE;
} }
@ -410,7 +413,7 @@ gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
GST_DEBUG("ensure render rect within %ux%u bounds", width, height); GST_DEBUG("ensure render rect within %ux%u bounds", width, height);
gst_vaapi_display_get_pixel_aspect_ratio( gst_vaapi_display_get_pixel_aspect_ratio(
sink->display, GST_VAAPI_PLUGIN_BASE_DISPLAY(sink),
&display_par_n, &display_par_d &display_par_n, &display_par_d
); );
GST_DEBUG("display pixel-aspect-ratio %d/%d", GST_DEBUG("display pixel-aspect-ratio %d/%d",
@ -455,6 +458,7 @@ gst_vaapisink_ensure_render_rect(GstVaapiSink *sink, guint width, guint height)
static void static void
gst_vaapisink_ensure_window_size(GstVaapiSink *sink, guint *pwidth, guint *pheight) gst_vaapisink_ensure_window_size(GstVaapiSink *sink, guint *pwidth, guint *pheight)
{ {
GstVaapiDisplay * const display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink);
GstVideoRectangle src_rect, dst_rect, out_rect; GstVideoRectangle src_rect, dst_rect, out_rect;
guint num, den, display_width, display_height, display_par_n, display_par_d; guint num, den, display_width, display_height, display_par_n, display_par_d;
gboolean success, scale; gboolean success, scale;
@ -465,7 +469,7 @@ gst_vaapisink_ensure_window_size(GstVaapiSink *sink, guint *pwidth, guint *pheig
return; return;
} }
gst_vaapi_display_get_size(sink->display, &display_width, &display_height); gst_vaapi_display_get_size(display, &display_width, &display_height);
if (sink->fullscreen) { if (sink->fullscreen) {
*pwidth = display_width; *pwidth = display_width;
*pheight = display_height; *pheight = display_height;
@ -473,7 +477,7 @@ gst_vaapisink_ensure_window_size(GstVaapiSink *sink, guint *pwidth, guint *pheig
} }
gst_vaapi_display_get_pixel_aspect_ratio( gst_vaapi_display_get_pixel_aspect_ratio(
sink->display, display,
&display_par_n, &display_par_d &display_par_n, &display_par_d
); );
@ -505,7 +509,7 @@ gst_vaapisink_ensure_window_size(GstVaapiSink *sink, guint *pwidth, guint *pheig
static inline gboolean static inline gboolean
gst_vaapisink_ensure_window(GstVaapiSink *sink, guint width, guint height) gst_vaapisink_ensure_window(GstVaapiSink *sink, guint width, guint height)
{ {
GstVaapiDisplay * const display = sink->display; GstVaapiDisplay * const display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink);
if (!sink->window) { if (!sink->window) {
switch (sink->display_type) { switch (sink->display_type) {
@ -543,6 +547,7 @@ gst_vaapisink_ensure_window(GstVaapiSink *sink, guint width, guint height)
static gboolean static gboolean
gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id) gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
{ {
GstVaapiDisplay *display;
Window rootwin; Window rootwin;
unsigned int width, height, border_width, depth; unsigned int width, height, border_width, depth;
int x, y; int x, y;
@ -550,15 +555,16 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
if (!gst_vaapisink_ensure_display(sink)) if (!gst_vaapisink_ensure_display(sink))
return FALSE; return FALSE;
display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink);
gst_vaapi_display_lock(sink->display); gst_vaapi_display_lock(display);
XGetGeometry( XGetGeometry(
gst_vaapi_display_x11_get_display(GST_VAAPI_DISPLAY_X11(sink->display)), gst_vaapi_display_x11_get_display(GST_VAAPI_DISPLAY_X11(display)),
xid, xid,
&rootwin, &rootwin,
&x, &y, &width, &height, &border_width, &depth &x, &y, &width, &height, &border_width, &depth
); );
gst_vaapi_display_unlock(sink->display); gst_vaapi_display_unlock(display);
if ((width != sink->window_width || height != sink->window_height) && if ((width != sink->window_width || height != sink->window_height) &&
!configure_notify_event_pending(sink, xid, width, height)) { !configure_notify_event_pending(sink, xid, width, height)) {
@ -577,11 +583,11 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
switch (sink->display_type) { switch (sink->display_type) {
#if USE_GLX #if USE_GLX
case GST_VAAPI_DISPLAY_TYPE_GLX: case GST_VAAPI_DISPLAY_TYPE_GLX:
sink->window = gst_vaapi_window_glx_new_with_xid(sink->display, xid); sink->window = gst_vaapi_window_glx_new_with_xid(display, xid);
break; break;
#endif #endif
case GST_VAAPI_DISPLAY_TYPE_X11: case GST_VAAPI_DISPLAY_TYPE_X11:
sink->window = gst_vaapi_window_x11_new_with_xid(sink->display, xid); sink->window = gst_vaapi_window_x11_new_with_xid(display, xid);
break; break;
default: default:
GST_ERROR("unsupported display type %d", sink->display_type); GST_ERROR("unsupported display type %d", sink->display_type);
@ -594,9 +600,10 @@ gst_vaapisink_ensure_window_xid(GstVaapiSink *sink, guintptr window_id)
static gboolean static gboolean
gst_vaapisink_ensure_rotation(GstVaapiSink *sink, gboolean recalc_display_rect) gst_vaapisink_ensure_rotation(GstVaapiSink *sink, gboolean recalc_display_rect)
{ {
GstVaapiDisplay * const display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink);
gboolean success = FALSE; gboolean success = FALSE;
g_return_val_if_fail(sink->display, FALSE); g_return_val_if_fail(display, FALSE);
if (sink->rotation == sink->rotation_req) if (sink->rotation == sink->rotation_req)
return TRUE; return TRUE;
@ -606,9 +613,9 @@ gst_vaapisink_ensure_rotation(GstVaapiSink *sink, gboolean recalc_display_rect)
goto end; goto end;
} }
gst_vaapi_display_lock(sink->display); gst_vaapi_display_lock(display);
success = gst_vaapi_display_set_rotation(sink->display, sink->rotation_req); success = gst_vaapi_display_set_rotation(display, sink->rotation_req);
gst_vaapi_display_unlock(sink->display); gst_vaapi_display_unlock(display);
if (!success) { if (!success) {
GST_ERROR("failed to change VA display rotation mode"); GST_ERROR("failed to change VA display rotation mode");
goto end; goto end;
@ -654,7 +661,7 @@ gst_vaapisink_ensure_video_buffer_pool(GstVaapiSink *sink, GstCaps *caps)
sink->video_buffer_size = 0; sink->video_buffer_size = 0;
} }
pool = gst_vaapi_video_buffer_pool_new(sink->display); pool = gst_vaapi_video_buffer_pool_new(GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
if (!pool) if (!pool)
goto error_create_pool; goto error_create_pool;
@ -701,6 +708,8 @@ gst_vaapisink_start(GstBaseSink *base_sink)
{ {
GstVaapiSink * const sink = GST_VAAPISINK(base_sink); GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(sink)))
return FALSE;
return gst_vaapisink_ensure_uploader(sink); return gst_vaapisink_ensure_uploader(sink);
} }
@ -714,9 +723,8 @@ gst_vaapisink_stop(GstBaseSink *base_sink)
g_clear_object(&sink->video_buffer_pool); g_clear_object(&sink->video_buffer_pool);
#endif #endif
gst_vaapi_window_replace(&sink->window, NULL); gst_vaapi_window_replace(&sink->window, NULL);
gst_vaapi_display_replace(&sink->display, NULL);
g_clear_object(&sink->uploader); g_clear_object(&sink->uploader);
gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(sink));
return TRUE; return TRUE;
} }
@ -769,6 +777,7 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
{ {
GstVaapiSink * const sink = GST_VAAPISINK(base_sink); GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
GstVideoInfo * const vip = &sink->video_info; GstVideoInfo * const vip = &sink->video_info;
GstVaapiDisplay *display;
guint win_width, win_height; guint win_width, win_height;
#if USE_DRM #if USE_DRM
@ -793,11 +802,12 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
if (!gst_vaapisink_ensure_display(sink)) if (!gst_vaapisink_ensure_display(sink))
return FALSE; return FALSE;
display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink);
#if !GST_CHECK_VERSION(1,0,0) #if !GST_CHECK_VERSION(1,0,0)
if (sink->use_video_raw) { if (sink->use_video_raw) {
/* Ensure the uploader is set up for upstream allocated buffers */ /* Ensure the uploader is set up for upstream allocated buffers */
if (!gst_vaapi_uploader_ensure_display(sink->uploader, sink->display)) if (!gst_vaapi_uploader_ensure_display(sink->uploader, display))
return FALSE; return FALSE;
if (!gst_vaapi_uploader_ensure_caps(sink->uploader, caps, NULL)) if (!gst_vaapi_uploader_ensure_caps(sink->uploader, caps, NULL))
return FALSE; return FALSE;
@ -812,9 +822,9 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
gst_vaapi_window_set_size(sink->window, win_width, win_height); gst_vaapi_window_set_size(sink->window, win_width, win_height);
} }
else { else {
gst_vaapi_display_lock(sink->display); gst_vaapi_display_lock(display);
gst_video_overlay_prepare_window_handle(GST_VIDEO_OVERLAY(sink)); gst_video_overlay_prepare_window_handle(GST_VIDEO_OVERLAY(sink));
gst_vaapi_display_unlock(sink->display); gst_vaapi_display_unlock(display);
if (sink->window) if (sink->window)
return TRUE; return TRUE;
if (!gst_vaapisink_ensure_window(sink, win_width, win_height)) if (!gst_vaapisink_ensure_window(sink, win_width, win_height))
@ -935,6 +945,7 @@ render_reflection(GstVaapiSink *sink)
static gboolean static gboolean
gst_vaapisink_ensure_texture(GstVaapiSink *sink, GstVaapiSurface *surface) gst_vaapisink_ensure_texture(GstVaapiSink *sink, GstVaapiSurface *surface)
{ {
GstVaapiDisplay * display = GST_VAAPI_PLUGIN_BASE_DISPLAY(sink);
GstVideoRectangle tex_rect, dis_rect, out_rect; GstVideoRectangle tex_rect, dis_rect, out_rect;
guint width, height; guint width, height;
@ -947,7 +958,7 @@ gst_vaapisink_ensure_texture(GstVaapiSink *sink, GstVaapiSurface *surface)
tex_rect.w = width; tex_rect.w = width;
tex_rect.h = height; tex_rect.h = height;
gst_vaapi_display_get_size(sink->display, &width, &height); gst_vaapi_display_get_size(display, &width, &height);
dis_rect.x = 0; dis_rect.x = 0;
dis_rect.y = 0; dis_rect.y = 0;
dis_rect.w = width; dis_rect.w = width;
@ -963,7 +974,7 @@ gst_vaapisink_ensure_texture(GstVaapiSink *sink, GstVaapiSurface *surface)
height = tex_rect.h; height = tex_rect.h;
GST_INFO("texture size %ux%u", width, height); GST_INFO("texture size %ux%u", width, height);
sink->texture = gst_vaapi_texture_new(sink->display, sink->texture = gst_vaapi_texture_new(display,
GL_TEXTURE_2D, GL_BGRA, width, height); GL_TEXTURE_2D, GL_BGRA, width, height);
return sink->texture != NULL; return sink->texture != NULL;
} }
@ -1188,9 +1199,8 @@ gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *src_buffer)
return ret; return ret;
meta = gst_buffer_get_vaapi_video_meta(buffer); meta = gst_buffer_get_vaapi_video_meta(buffer);
if (sink->display != gst_vaapi_video_meta_get_display(meta)) GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(sink,
gst_vaapi_display_replace(&sink->display, gst_vaapi_video_meta_get_display(meta));
gst_vaapi_video_meta_get_display(meta));
if (!sink->window) if (!sink->window)
goto error; goto error;
@ -1325,7 +1335,7 @@ gst_vaapisink_buffer_alloc(
return GST_FLOW_OK; return GST_FLOW_OK;
} }
if (!gst_vaapi_uploader_ensure_display(sink->uploader, sink->display)) if (!gst_vaapi_uploader_ensure_display(sink->uploader, GST_VAAPI_PLUGIN_BASE_DISPLAY(sink)))
return GST_FLOW_NOT_SUPPORTED; return GST_FLOW_NOT_SUPPORTED;
if (!gst_vaapi_uploader_ensure_caps(sink->uploader, caps, NULL)) if (!gst_vaapi_uploader_ensure_caps(sink->uploader, caps, NULL))
return GST_FLOW_NOT_SUPPORTED; return GST_FLOW_NOT_SUPPORTED;
@ -1350,7 +1360,7 @@ gst_vaapisink_set_context(GstElement *element, GstContext *context)
if (gst_vaapi_video_context_get_display(context, &display)) { if (gst_vaapi_video_context_get_display(context, &display)) {
GST_INFO_OBJECT(element, "set display %p", display); GST_INFO_OBJECT(element, "set display %p", display);
gst_vaapi_display_replace(&sink->display, display); GST_VAAPI_PLUGIN_BASE_DISPLAY_REPLACE(sink, display);
gst_vaapi_display_unref(display); gst_vaapi_display_unref(display);
} }
} }
@ -1363,8 +1373,8 @@ gst_vaapisink_query(GstBaseSink *base_sink, GstQuery *query)
GST_INFO_OBJECT(sink, "query type %s", GST_QUERY_TYPE_NAME(query)); GST_INFO_OBJECT(sink, "query type %s", GST_QUERY_TYPE_NAME(query));
if (gst_vaapi_reply_to_query(query, sink->display)) { if (gst_vaapi_reply_to_query(query, GST_VAAPI_PLUGIN_BASE_DISPLAY(sink))) {
GST_DEBUG("sharing display %p", sink->display); GST_DEBUG("sharing display %p", GST_VAAPI_PLUGIN_BASE_DISPLAY(sink));
return TRUE; return TRUE;
} }
@ -1377,6 +1387,7 @@ gst_vaapisink_finalize(GObject *object)
{ {
gst_vaapisink_destroy(GST_VAAPISINK(object)); gst_vaapisink_destroy(GST_VAAPISINK(object));
gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
G_OBJECT_CLASS(gst_vaapisink_parent_class)->finalize(object); G_OBJECT_CLASS(gst_vaapisink_parent_class)->finalize(object);
} }
@ -1467,6 +1478,8 @@ gst_vaapisink_class_init(GstVaapiSinkClass *klass)
GST_DEBUG_CATEGORY_INIT(gst_debug_vaapisink, GST_DEBUG_CATEGORY_INIT(gst_debug_vaapisink,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
object_class->finalize = gst_vaapisink_finalize; object_class->finalize = gst_vaapisink_finalize;
object_class->set_property = gst_vaapisink_set_property; object_class->set_property = gst_vaapisink_set_property;
object_class->get_property = gst_vaapisink_get_property; object_class->get_property = gst_vaapisink_get_property;
@ -1585,8 +1598,9 @@ gst_vaapisink_class_init(GstVaapiSinkClass *klass)
static void static void
gst_vaapisink_init(GstVaapiSink *sink) gst_vaapisink_init(GstVaapiSink *sink)
{ {
gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(sink), GST_CAT_DEFAULT);
sink->caps = NULL; sink->caps = NULL;
sink->display = NULL;
sink->window = NULL; sink->window = NULL;
sink->window_width = 0; sink->window_width = 0;
sink->window_height = 0; sink->window_height = 0;

8
gst/vaapi/gstvaapisink.h
View file

@ -25,8 +25,7 @@
#ifndef GST_VAAPISINK_H #ifndef GST_VAAPISINK_H
#define GST_VAAPISINK_H #define GST_VAAPISINK_H
#include <gst/video/gstvideosink.h> #include "gstvaapipluginbase.h"
#include <gst/vaapi/gstvaapidisplay.h>
#include <gst/vaapi/gstvaapiwindow.h> #include <gst/vaapi/gstvaapiwindow.h>
#if USE_GLX #if USE_GLX
#include <gst/vaapi/gstvaapitexture.h> #include <gst/vaapi/gstvaapitexture.h>
@ -68,11 +67,10 @@ typedef struct _GstVaapiTexture GstVaapiTexture;
struct _GstVaapiSink { struct _GstVaapiSink {
/*< private >*/ /*< private >*/
GstVideoSink parent_instance; GstVaapiPluginBase parent_instance;
GstVaapiUploader *uploader; GstVaapiUploader *uploader;
GstCaps *caps; GstCaps *caps;
GstVaapiDisplay *display;
GstVaapiDisplayType display_type; GstVaapiDisplayType display_type;
GstVaapiWindow *window; GstVaapiWindow *window;
guint window_width; guint window_width;
@ -104,7 +102,7 @@ struct _GstVaapiSink {
struct _GstVaapiSinkClass { struct _GstVaapiSinkClass {
/*< private >*/ /*< private >*/
GstVideoSinkClass parent_class; GstVaapiPluginBaseClass parent_class;
}; };
GType GType

32
gst/vaapi/gstvaapiupload.c
View file

@ -92,10 +92,11 @@ gst_vaapiupload_set_video_context(GstVideoContext *context, const gchar *type,
{ {
GstVaapiUpload * const upload = GST_VAAPIUPLOAD(context); GstVaapiUpload * const upload = GST_VAAPIUPLOAD(context);
gst_vaapi_set_display(type, value, &upload->display); gst_vaapi_set_display(type, value, &GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
if (upload->uploader) if (upload->uploader)
gst_vaapi_uploader_ensure_display(upload->uploader, upload->display); gst_vaapi_uploader_ensure_display(upload->uploader,
GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
} }
static void static void
@ -176,7 +177,6 @@ static void
gst_vaapiupload_destroy(GstVaapiUpload *upload) gst_vaapiupload_destroy(GstVaapiUpload *upload)
{ {
g_clear_object(&upload->uploader); g_clear_object(&upload->uploader);
gst_vaapi_display_replace(&upload->display, NULL);
} }
static void static void
@ -184,6 +184,7 @@ gst_vaapiupload_finalize(GObject *object)
{ {
gst_vaapiupload_destroy(GST_VAAPIUPLOAD(object)); gst_vaapiupload_destroy(GST_VAAPIUPLOAD(object));
gst_vaapi_plugin_base_finalize(GST_VAAPI_PLUGIN_BASE(object));
G_OBJECT_CLASS(gst_vaapiupload_parent_class)->finalize(object); G_OBJECT_CLASS(gst_vaapiupload_parent_class)->finalize(object);
} }
@ -198,6 +199,8 @@ gst_vaapiupload_class_init(GstVaapiUploadClass *klass)
GST_DEBUG_CATEGORY_INIT(gst_debug_vaapiupload, GST_DEBUG_CATEGORY_INIT(gst_debug_vaapiupload,
GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC); GST_PLUGIN_NAME, 0, GST_PLUGIN_DESC);
gst_vaapi_plugin_base_class_init(GST_VAAPI_PLUGIN_BASE_CLASS(klass));
object_class->finalize = gst_vaapiupload_finalize; object_class->finalize = gst_vaapiupload_finalize;
trans_class->start = gst_vaapiupload_start; trans_class->start = gst_vaapiupload_start;
@ -228,6 +231,8 @@ gst_vaapiupload_init(GstVaapiUpload *upload)
{ {
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
gst_vaapi_plugin_base_init(GST_VAAPI_PLUGIN_BASE(upload), GST_CAT_DEFAULT);
/* Override buffer allocator on sink pad */ /* Override buffer allocator on sink pad */
sinkpad = gst_element_get_static_pad(GST_ELEMENT(upload), "sink"); sinkpad = gst_element_get_static_pad(GST_ELEMENT(upload), "sink");
gst_pad_set_bufferalloc_function( gst_pad_set_bufferalloc_function(
@ -247,7 +252,7 @@ static inline gboolean
gst_vaapiupload_ensure_display(GstVaapiUpload *upload) gst_vaapiupload_ensure_display(GstVaapiUpload *upload)
{ {
return gst_vaapi_ensure_display(upload, GST_VAAPI_DISPLAY_TYPE_ANY, return gst_vaapi_ensure_display(upload, GST_VAAPI_DISPLAY_TYPE_ANY,
&upload->display); &GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
} }
static gboolean static gboolean
@ -257,11 +262,13 @@ gst_vaapiupload_ensure_uploader(GstVaapiUpload *upload)
return FALSE; return FALSE;
if (!upload->uploader) { if (!upload->uploader) {
upload->uploader = gst_vaapi_uploader_new(upload->display); upload->uploader = gst_vaapi_uploader_new(
GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
if (!upload->uploader) if (!upload->uploader)
return FALSE; return FALSE;
} }
if (!gst_vaapi_uploader_ensure_display(upload->uploader, upload->display)) if (!gst_vaapi_uploader_ensure_display(upload->uploader,
GST_VAAPI_PLUGIN_BASE_DISPLAY(upload)))
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
@ -271,6 +278,8 @@ gst_vaapiupload_start(GstBaseTransform *trans)
{ {
GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans); GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans);
if (!gst_vaapi_plugin_base_open(GST_VAAPI_PLUGIN_BASE(trans)))
return FALSE;
if (!gst_vaapiupload_ensure_uploader(upload)) if (!gst_vaapiupload_ensure_uploader(upload))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -279,9 +288,7 @@ gst_vaapiupload_start(GstBaseTransform *trans)
static gboolean static gboolean
gst_vaapiupload_stop(GstBaseTransform *trans) gst_vaapiupload_stop(GstBaseTransform *trans)
{ {
GstVaapiUpload * const upload = GST_VAAPIUPLOAD(trans); gst_vaapi_plugin_base_close(GST_VAAPI_PLUGIN_BASE(trans));
gst_vaapi_display_replace(&upload->display, NULL);
return TRUE; return TRUE;
} }
@ -396,7 +403,8 @@ gst_vaapiupload_buffer_alloc(
*pbuf = NULL; *pbuf = NULL;
if (!gst_vaapi_uploader_ensure_display(upload->uploader, upload->display)) if (!gst_vaapi_uploader_ensure_display(upload->uploader,
GST_VAAPI_PLUGIN_BASE_DISPLAY(upload)))
return GST_FLOW_NOT_SUPPORTED; return GST_FLOW_NOT_SUPPORTED;
if (!gst_vaapi_uploader_ensure_caps(upload->uploader, caps, NULL)) if (!gst_vaapi_uploader_ensure_caps(upload->uploader, caps, NULL))
return GST_FLOW_NOT_SUPPORTED; return GST_FLOW_NOT_SUPPORTED;
@ -465,9 +473,9 @@ gst_vaapiupload_query(GstPad *pad, GstQuery *query)
GstVaapiUpload *upload = GST_VAAPIUPLOAD (gst_pad_get_parent_element (pad)); GstVaapiUpload *upload = GST_VAAPIUPLOAD (gst_pad_get_parent_element (pad));
gboolean res; gboolean res;
GST_DEBUG ("sharing display %p", upload->display); GST_DEBUG ("sharing display %p", GST_VAAPI_PLUGIN_BASE_DISPLAY(upload));
if (gst_vaapi_reply_to_query (query, upload->display)) if (gst_vaapi_reply_to_query (query, GST_VAAPI_PLUGIN_BASE_DISPLAY(upload)))
res = TRUE; res = TRUE;
else else
res = gst_pad_query_default (pad, query); res = gst_pad_query_default (pad, query);

7
gst/vaapi/gstvaapiupload.h
View file

@ -25,7 +25,7 @@
#ifndef GST_VAAPIUPLOAD_H #ifndef GST_VAAPIUPLOAD_H
#define GST_VAAPIUPLOAD_H #define GST_VAAPIUPLOAD_H
#include <gst/base/gstbasetransform.h> #include "gstvaapipluginbase.h"
#include "gstvaapiuploader.h" #include "gstvaapiuploader.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@ -59,15 +59,14 @@ typedef struct _GstVaapiUploadClass GstVaapiUploadClass;
struct _GstVaapiUpload { struct _GstVaapiUpload {
/*< private >*/ /*< private >*/
GstBaseTransform parent_instance; GstVaapiPluginBase parent_instance;
GstVaapiDisplay *display;
GstVaapiUploader *uploader; GstVaapiUploader *uploader;
}; };
struct _GstVaapiUploadClass { struct _GstVaapiUploadClass {
/*< private >*/ /*< private >*/
GstBaseTransformClass parent_class; GstVaapiPluginBaseClass parent_class;
}; };
GType GType