Add initial H.264 decoder.

gst-libs/gst/vaapi/Makefile.am

@@ -146,12 +146,14 @@ endif
 if USE_CODEC_PARSERS
 libgstvaapi_source_c	+= \
 	gstvaapicodec_objects.c			\
+	gstvaapidecoder_h264.c			\
 	gstvaapidecoder_mpeg2.c			\
 	gstvaapidecoder_mpeg4.c			\
 	gstvaapidecoder_objects.c		\
 	gstvaapidecoder_vc1.c			\
 	$(NULL)
 libgstvaapi_source_h	+= \
+	gstvaapidecoder_h264.h			\
 	gstvaapidecoder_mpeg2.h			\
 	gstvaapidecoder_mpeg4.h			\
 	gstvaapidecoder_vc1.h			\

gst-libs/gst/vaapi/gstvaapidecoder_h264.h

@@ -0,0 +1,87 @@
+/*
+ *  gstvaapidecoder_h264.h - H.264 decoder
+ *
+ *  Copyright (C) 2011-2012 Intel Corporation
+ *
+ *  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_DECODER_H264_H
+#define GST_VAAPI_DECODER_H264_H
+
+#include <gst/vaapi/gstvaapidecoder.h>
+
+G_BEGIN_DECLS
+
+#define GST_VAAPI_TYPE_DECODER_H264 \
+    (gst_vaapi_decoder_h264_get_type())
+
+#define GST_VAAPI_DECODER_H264(obj)                            \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj),                         \
+                                GST_VAAPI_TYPE_DECODER_H264,   \
+                                GstVaapiDecoderH264))
+
+#define GST_VAAPI_DECODER_H264_CLASS(klass)                    \
+    (G_TYPE_CHECK_CLASS_CAST((klass),                          \
+                             GST_VAAPI_TYPE_DECODER_H264,      \
+                             GstVaapiDecoderH264Class))
+
+#define GST_VAAPI_IS_DECODER_H264(obj) \
+    (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_VAAPI_TYPE_DECODER_H264))
+
+#define GST_VAAPI_IS_DECODER_H264_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_TYPE((klass), GST_VAAPI_TYPE_DECODER_H264))
+
+#define GST_VAAPI_DECODER_H264_GET_CLASS(obj)                  \
+    (G_TYPE_INSTANCE_GET_CLASS((obj),                          \
+                               GST_VAAPI_TYPE_DECODER_H264,    \
+                               GstVaapiDecoderH264Class))
+
+typedef struct _GstVaapiDecoderH264             GstVaapiDecoderH264;
+typedef struct _GstVaapiDecoderH264Private      GstVaapiDecoderH264Private;
+typedef struct _GstVaapiDecoderH264Class        GstVaapiDecoderH264Class;
+
+/**
+ * GstVaapiDecoderH264:
+ *
+ * A decoder based on H264.
+ */
+struct _GstVaapiDecoderH264 {
+    /*< private >*/
+    GstVaapiDecoder parent_instance;
+
+    GstVaapiDecoderH264Private *priv;
+};
+
+/**
+ * GstVaapiDecoderH264Class:
+ *
+ * A decoder class based on H264.
+ */
+struct _GstVaapiDecoderH264Class {
+    /*< private >*/
+    GstVaapiDecoderClass parent_class;
+};
+
+GType
+gst_vaapi_decoder_h264_get_type(void);
+
+GstVaapiDecoder *
+gst_vaapi_decoder_h264_new(GstVaapiDisplay *display, GstCaps *caps);
+
+G_END_DECLS
+
+#endif /* GST_VAAPI_DECODER_H264_H */

gst/vaapi/gstvaapidecode.c

@@ -50,6 +50,7 @@
 # include <gst/vaapi/gstvaapidecoder_ffmpeg.h>
 #endif
 #if USE_CODEC_PARSERS
+# include <gst/vaapi/gstvaapidecoder_h264.h>
 # include <gst/vaapi/gstvaapidecoder_mpeg2.h>
 # include <gst/vaapi/gstvaapidecoder_mpeg4.h>
 # include <gst/vaapi/gstvaapidecoder_vc1.h>
@@ -311,7 +312,9 @@ gst_vaapidecode_create(GstVaapiDecode *decode, GstCaps *caps)
         structure = gst_caps_get_structure(caps, 0);
         if (!structure)
             return FALSE;
-        if (gst_structure_has_name(structure, "video/mpeg")) {
+        if (gst_structure_has_name(structure, "video/x-h264"))
+            decode->decoder = gst_vaapi_decoder_h264_new(dpy, caps);
+        else if (gst_structure_has_name(structure, "video/mpeg")) {
             if (!gst_structure_get_int(structure, "mpegversion", &version))
                 return FALSE;
             if (version == 2)

tests/test-decode.c

@@ -34,6 +34,7 @@
 # include <gst/vaapi/gstvaapidecoder_ffmpeg.h>
 #endif
 #if USE_CODEC_PARSERS
+# include <gst/vaapi/gstvaapidecoder_h264.h>
 # include <gst/vaapi/gstvaapidecoder_mpeg2.h>
 # include <gst/vaapi/gstvaapidecoder_vc1.h>
 #endif
@@ -165,6 +166,9 @@ main(int argc, char *argv[])
     else {
 #if USE_CODEC_PARSERS
         switch (gst_vaapi_profile_get_codec(info.profile)) {
+        case GST_VAAPI_CODEC_H264:
+            decoder = gst_vaapi_decoder_h264_new(display, decoder_caps);
+            break;
         case GST_VAAPI_CODEC_MPEG2:
             decoder = gst_vaapi_decoder_mpeg2_new(display, decoder_caps);
             break;