Move caps initialization to parent class.

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.c b/gst-libs/gst/vaapi/gstvaapidecoder.c
index 07c3b9b..12d79dc 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapidecoder.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder.c
@@ -42,10 +42,7 @@ enum {
     PROP_0,
 
     PROP_DISPLAY,
-    PROP_CODEC,
-    PROP_CODEC_DATA,
-    PROP_WIDTH,
-    PROP_HEIGHT,
+    PROP_CAPS,
 };
 
 static void
@@ -156,6 +153,46 @@ set_codec_data(GstVaapiDecoder *decoder, GstBuffer *codec_data)
 }
 
 static void
+set_caps(GstVaapiDecoder *decoder, GstCaps *caps)
+{
+    GstVaapiDecoderPrivate * const priv = decoder->priv;
+    GstStructure *structure;
+    GstVaapiProfile profile;
+    const GValue *v_codec_data;
+    gint width, height;
+
+    if (priv->caps) {
+        gst_caps_unref(priv->caps);
+        priv->caps = NULL;
+    }
+
+    if (caps) {
+        structure = gst_caps_get_structure(caps, 0);
+        if (!structure)
+            return;
+
+        profile = gst_vaapi_profile_from_caps(caps);
+        if (!profile)
+            return;
+
+        priv->codec = gst_vaapi_profile_get_codec(profile);
+        if (!priv->codec)
+            return;
+
+        if (!gst_structure_get_int(structure, "width", &width))
+            width = 0;
+        if (!gst_structure_get_int(structure, "height", &height))
+            height = 0;
+        priv->width  = width;
+        priv->height = height;
+
+        v_codec_data = gst_structure_get_value(structure, "codec_data");
+        if (v_codec_data)
+            set_codec_data(decoder, gst_value_get_buffer(v_codec_data));
+    }
+}
+
+static void
 clear_queue(GQueue *q, GDestroyNotify destroy)
 {
     while (!g_queue_is_empty(q))
@@ -168,13 +205,14 @@ gst_vaapi_decoder_finalize(GObject *object)
     GstVaapiDecoder * const        decoder = GST_VAAPI_DECODER(object);
     GstVaapiDecoderPrivate * const priv    = decoder->priv;
 
+    set_caps(decoder, NULL);
     set_codec_data(decoder, NULL);
 
     if (priv->context) {
         g_object_unref(priv->context);
         priv->context = NULL;
     }
-
+ 
     if (priv->buffers) {
         clear_queue(priv->buffers, (GDestroyNotify)destroy_buffer);
         g_queue_free(priv->buffers);
@@ -203,23 +241,15 @@ gst_vaapi_decoder_set_property(
     GParamSpec   *pspec
 )
 {
-    GstVaapiDecoderPrivate * const priv = GST_VAAPI_DECODER(object)->priv;
+    GstVaapiDecoder * const        decoder = GST_VAAPI_DECODER(object);
+    GstVaapiDecoderPrivate * const priv    = decoder->priv;
 
     switch (prop_id) {
     case PROP_DISPLAY:
         priv->display = g_object_ref(g_value_get_object(value));
         break;
-    case PROP_CODEC:
-        priv->codec = g_value_get_uint(value);
-        break;
-    case PROP_CODEC_DATA:
-        set_codec_data(GST_VAAPI_DECODER(object), gst_value_get_buffer(value));
-        break;
-    case PROP_WIDTH:
-        priv->width = g_value_get_uint(value);
-        break;
-    case PROP_HEIGHT:
-        priv->height = g_value_get_uint(value);
+    case PROP_CAPS:
+        set_caps(decoder, g_value_get_pointer(value));
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -241,18 +271,6 @@ gst_vaapi_decoder_get_property(
     case PROP_DISPLAY:
         g_value_set_object(value, priv->display);
         break;
-    case PROP_CODEC:
-        g_value_set_uint(value, priv->codec);
-        break;
-    case PROP_CODEC_DATA:
-        gst_value_set_buffer(value, priv->codec_data);
-        break;
-    case PROP_WIDTH:
-        g_value_set_uint(value, priv->width);
-        break;
-    case PROP_HEIGHT:
-        g_value_set_uint(value, priv->height);
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -286,39 +304,11 @@ gst_vaapi_decoder_class_init(GstVaapiDecoderClass *klass)
 
     g_object_class_install_property
         (object_class,
-         PROP_CODEC,
-         g_param_spec_uint("codec",
-                           "Codec",
-                           "The codec handled by the decoder",
-                           0, G_MAXINT32, 0,
-                           G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
-
-    g_object_class_install_property
-        (object_class,
-         PROP_CODEC_DATA,
-         gst_param_spec_mini_object("codec-data",
-                                    "Codec data",
-                                    "Extra codec data",
-                                    GST_TYPE_BUFFER,
-                                    G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY));
-
-    g_object_class_install_property
-        (object_class,
-         PROP_WIDTH,
-         g_param_spec_uint("width",
-                           "Width",
-                           "The coded width of the picture",
-                           0, G_MAXINT32, 0,
-                           G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
-
-    g_object_class_install_property
-        (object_class,
-         PROP_HEIGHT,
-         g_param_spec_uint("height",
-                           "Height",
-                           "The coded height of the picture",
-                           0, G_MAXINT32, 0,
-                           G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
+         PROP_CAPS,
+         g_param_spec_pointer("caps",
+                              "Decoder caps",
+                              "The decoder caps",
+                              G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY));
 }
 
 static void
@@ -328,6 +318,7 @@ gst_vaapi_decoder_init(GstVaapiDecoder *decoder)
 
     decoder->priv               = priv;
     priv->context               = NULL;
+    priv->caps                  = NULL;
     priv->codec                 = 0;
     priv->codec_data            = NULL;
     priv->width                 = 0;

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
index b756a84..17e4029 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
@@ -413,6 +413,9 @@ gst_vaapi_decoder_ffmpeg_create(GstVaapiDecoderFfmpeg *ffdecoder)
 {
     GstVaapiDecoderFfmpegPrivate * const priv = ffdecoder->priv;
 
+    if (!GST_VAAPI_DECODER_CODEC(ffdecoder))
+        return FALSE;
+
     if (!priv->frame) {
         priv->frame = avcodec_alloc_frame();
         if (!priv->frame)
@@ -643,44 +646,20 @@ gst_vaapi_decoder_ffmpeg_new(
 GstVaapiDecoder *
 gst_vaapi_decoder_ffmpeg_new_from_caps(GstVaapiDisplay *display, GstCaps *caps)
 {
-    GstStructure *structure;
-    GstVaapiProfile profile;
-    GstVaapiCodec codec;
-    const GValue *v_codec_data;
-    GstBuffer *codec_data;
-    gint width, height;
+    GstVaapiDecoderFfmpeg *ffdecoder;
 
     g_return_val_if_fail(GST_VAAPI_IS_DISPLAY(display), NULL);
     g_return_val_if_fail(GST_IS_CAPS(caps), NULL);
 
-    structure = gst_caps_get_structure(caps, 0);
-    if (!structure)
-        return NULL;
-
-    profile = gst_vaapi_profile_from_caps(caps);
-    if (!profile)
-        return NULL;
-
-    codec = gst_vaapi_profile_get_codec(profile);
-    if (!codec)
+    ffdecoder = g_object_new(
+        GST_VAAPI_TYPE_DECODER_FFMPEG,
+        "display", display,
+        "caps",    caps,
+        NULL
+    );
+    if (!ffdecoder->priv->is_constructed) {
+        g_object_unref(ffdecoder);
         return NULL;
-
-    if (!gst_structure_get_int(structure, "width", &width))
-        width = 0;
-    if (!gst_structure_get_int(structure, "height", &height))
-        height = 0;
-
-    v_codec_data = gst_structure_get_value(structure, "codec_data");
-    if (v_codec_data)
-        codec_data = gst_value_get_buffer(v_codec_data);
-    else
-        codec_data = NULL;
-
-    return g_object_new(GST_VAAPI_TYPE_DECODER_FFMPEG,
-                        "display",    display,
-                        "codec",      codec,
-                        "codec-data", codec_data,
-                        "width",      width,
-                        "height",     height,
-                        NULL);
+    }
+    return GST_VAAPI_DECODER_CAST(ffdecoder);
 }

diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_priv.h b/gst-libs/gst/vaapi/gstvaapidecoder_priv.h
index 2b30cf3..c824188 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapidecoder_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_priv.h
@@ -112,6 +112,7 @@ G_BEGIN_DECLS
 struct _GstVaapiDecoderPrivate {
     GstVaapiDisplay    *display;
     GstVaapiContext    *context;
+    GstCaps            *caps;
     GstVaapiCodec       codec;
     GstBuffer          *codec_data;
     guint               width;