From 67ac84c7b570750200b60cc5c1032c496298e564 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 20 Sep 2012 18:03:59 +0200 Subject: [PATCH] codecparsers: Add Mpeg Video GstMeta This can be used by parsers to provide pre-parsed information to downstream elements that would require it (so they can avoid having to parse the bitstream again). --- docs/libs/gst-plugins-bad-libs-docs.sgml | 1 + docs/libs/gst-plugins-bad-libs-sections.txt | 14 ++ gst-libs/gst/codecparsers/Makefile.am | 6 +- gst-libs/gst/codecparsers/gstmpegvideometa.c | 142 +++++++++++++++++++ gst-libs/gst/codecparsers/gstmpegvideometa.h | 87 ++++++++++++ 5 files changed, 248 insertions(+), 2 deletions(-) create mode 100644 gst-libs/gst/codecparsers/gstmpegvideometa.c create mode 100644 gst-libs/gst/codecparsers/gstmpegvideometa.h diff --git a/docs/libs/gst-plugins-bad-libs-docs.sgml b/docs/libs/gst-plugins-bad-libs-docs.sgml index d4e0060ca3..ea206081ab 100644 --- a/docs/libs/gst-plugins-bad-libs-docs.sgml +++ b/docs/libs/gst-plugins-bad-libs-docs.sgml @@ -32,6 +32,7 @@ + diff --git a/docs/libs/gst-plugins-bad-libs-sections.txt b/docs/libs/gst-plugins-bad-libs-sections.txt index 433c4b962a..15853cd93e 100644 --- a/docs/libs/gst-plugins-bad-libs-sections.txt +++ b/docs/libs/gst-plugins-bad-libs-sections.txt @@ -89,6 +89,20 @@ gst_vc1_bitplanes_ensure_size +
+gstmpegvideometa +gst/codecparsers/gstmpegvideometa.h +GST_MPEG_VIDEO_META_API_TYPE +GST_MPEG_VIDEO_META_INFO +GstMpegVideoMeta +gst_buffer_add_mpeg_video_meta +gst_buffer_get_mpeg_video_meta +gst_mpeg_video_meta_get_info + +gst_mpeg_video_meta_api_get_type +
+ +
gstmpegvideoparser mpegvideoparser diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am index f6d592630e..a6992fbbe7 100644 --- a/gst-libs/gst/codecparsers/Makefile.am +++ b/gst-libs/gst/codecparsers/Makefile.am @@ -2,7 +2,8 @@ lib_LTLIBRARIES = libgstcodecparsers-@GST_API_VERSION@.la libgstcodecparsers_@GST_API_VERSION@_la_SOURCES = \ gstmpegvideoparser.c gsth264parser.c gstvc1parser.c gstmpeg4parser.c \ - parserutils.c + parserutils.c \ + gstmpegvideometa.c libgstcodecparsers_@GST_API_VERSION@includedir = \ $(includedir)/gstreamer-@GST_API_VERSION@/gst/codecparsers @@ -10,7 +11,8 @@ libgstcodecparsers_@GST_API_VERSION@includedir = \ noinst_HEADERS = parserutils.h libgstcodecparsers_@GST_API_VERSION@include_HEADERS = \ - gstmpegvideoparser.h gsth264parser.h gstvc1parser.h gstmpeg4parser.h + gstmpegvideoparser.h gsth264parser.h gstvc1parser.h gstmpeg4parser.h \ + gstmpegvideometa.h libgstcodecparsers_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BAD_CFLAGS) \ diff --git a/gst-libs/gst/codecparsers/gstmpegvideometa.c b/gst-libs/gst/codecparsers/gstmpegvideometa.c new file mode 100644 index 0000000000..5d394c5138 --- /dev/null +++ b/gst-libs/gst/codecparsers/gstmpegvideometa.c @@ -0,0 +1,142 @@ +/* + * GStreamer + * Copyright (C) 2012 Edward Hervey + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "gstmpegvideometa.h" + +GST_DEBUG_CATEGORY (mpegv_meta_debug); +#define GST_CAT_DEFAULT mpegv_meta_debug + +static gboolean +gst_mpeg_video_meta_init (GstMpegVideoMeta * mpeg_video_meta, + gpointer params, GstBuffer * buffer) +{ + mpeg_video_meta->sequencehdr = NULL; + mpeg_video_meta->sequenceext = NULL; + mpeg_video_meta->sequencedispext = NULL; + mpeg_video_meta->pichdr = NULL; + mpeg_video_meta->picext = NULL; + mpeg_video_meta->quantext = NULL; + + return TRUE; +} + +static void +gst_mpeg_video_meta_free (GstMpegVideoMeta * mpeg_video_meta, + GstBuffer * buffer) +{ + if (mpeg_video_meta->sequencehdr) + g_slice_free (GstMpegVideoSequenceHdr, mpeg_video_meta->sequencehdr); + if (mpeg_video_meta->sequenceext) + g_slice_free (GstMpegVideoSequenceExt, mpeg_video_meta->sequenceext); + if (mpeg_video_meta->sequencedispext) + g_slice_free (GstMpegVideoSequenceDisplayExt, + mpeg_video_meta->sequencedispext); + if (mpeg_video_meta->pichdr) + g_slice_free (GstMpegVideoPictureHdr, mpeg_video_meta->pichdr); + if (mpeg_video_meta->picext) + g_slice_free (GstMpegVideoPictureExt, mpeg_video_meta->picext); + if (mpeg_video_meta->quantext) + g_slice_free (GstMpegVideoQuantMatrixExt, mpeg_video_meta->quantext); +} + +GType +gst_mpeg_video_meta_api_get_type (void) +{ + static volatile GType type; + static const gchar *tags[] = { "memory", NULL }; /* don't know what to set here */ + + if (g_once_init_enter (&type)) { + GType _type = gst_meta_api_type_register ("GstMpegVideoMetaAPI", tags); + GST_DEBUG_CATEGORY_INIT (mpegv_meta_debug, "mpegvideometa", 0, + "MPEG-1/2 video GstMeta"); + + g_once_init_leave (&type, _type); + } + return type; +} + +const GstMetaInfo * +gst_mpeg_video_meta_get_info (void) +{ + static const GstMetaInfo *mpeg_video_meta_info = NULL; + + if (g_once_init_enter (&mpeg_video_meta_info)) { + const GstMetaInfo *meta = gst_meta_register (GST_MPEG_VIDEO_META_API_TYPE, + "GstMpegVideoMeta", sizeof (GstMpegVideoMeta), + (GstMetaInitFunction) gst_mpeg_video_meta_init, + (GstMetaFreeFunction) gst_mpeg_video_meta_free, + (GstMetaTransformFunction) NULL); + g_once_init_leave (&mpeg_video_meta_info, meta); + } + + return mpeg_video_meta_info; +} + +/** + * gst_buffer_add_mpeg_video_meta: + * @buffer: a #GstBuffer + * + * Creates and adds a #GstMpegVideoMeta to a @buffer. + * + * Provided structures must either be %NULL or GSlice-allocated. + * + * Returns: (transfer full): a newly created #GstMpegVideoMeta + */ +GstMpegVideoMeta * +gst_buffer_add_mpeg_video_meta (GstBuffer * buffer, + const GstMpegVideoSequenceHdr * seq_hdr, + const GstMpegVideoSequenceExt * seq_ext, + const GstMpegVideoSequenceDisplayExt * disp_ext, + const GstMpegVideoPictureHdr * pic_hdr, + const GstMpegVideoPictureExt * pic_ext, + const GstMpegVideoQuantMatrixExt * quant_ext) +{ + GstMpegVideoMeta *mpeg_video_meta; + + mpeg_video_meta = + (GstMpegVideoMeta *) gst_buffer_add_meta (buffer, + GST_MPEG_VIDEO_META_INFO, NULL); + + GST_DEBUG + ("seq_hdr:%p, seq_ext:%p, disp_ext:%p, pic_hdr:%p, pic_ext:%p, quant_ext:%p", + seq_hdr, seq_ext, disp_ext, pic_hdr, pic_ext, quant_ext); + + if (seq_hdr) + mpeg_video_meta->sequencehdr = + g_slice_dup (GstMpegVideoSequenceHdr, seq_hdr); + if (seq_ext) + mpeg_video_meta->sequenceext = + g_slice_dup (GstMpegVideoSequenceExt, seq_ext); + if (disp_ext) + mpeg_video_meta->sequencedispext = + g_slice_dup (GstMpegVideoSequenceDisplayExt, disp_ext); + mpeg_video_meta->pichdr = g_slice_dup (GstMpegVideoPictureHdr, pic_hdr); + if (pic_ext) + mpeg_video_meta->picext = g_slice_dup (GstMpegVideoPictureExt, pic_ext); + if (quant_ext) + mpeg_video_meta->quantext = + g_slice_dup (GstMpegVideoQuantMatrixExt, quant_ext); + + return mpeg_video_meta; +} diff --git a/gst-libs/gst/codecparsers/gstmpegvideometa.h b/gst-libs/gst/codecparsers/gstmpegvideometa.h new file mode 100644 index 0000000000..fd4e7245e8 --- /dev/null +++ b/gst-libs/gst/codecparsers/gstmpegvideometa.h @@ -0,0 +1,87 @@ +/* Gstreamer + * Copyright (C) <2012> Edward Hervey + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_MPEG_VIDEO_META_H__ +#define __GST_MPEG_VIDEO_META_H__ + +#ifndef GST_USE_UNSTABLE_API +#warning "The Mpeg video parsing library is unstable API and may change in future." +#warning "You can define GST_USE_UNSTABLE_API to avoid this warning." +#endif + +#include +#include + +G_BEGIN_DECLS + +typedef struct _GstMpegVideoMeta GstMpegVideoMeta; + +GType gst_mpeg_video_meta_api_get_type (void); +#define GST_MPEG_VIDEO_META_API_TYPE (gst_mpeg_video_meta_api_get_type()) +#define GST_MPEG_VIDEO_META_INFO (gst_mpeg_video_meta_get_info()) +const GstMetaInfo * gst_mpeg_video_meta_get_info (void); + +/** + * GstMpegVideoMeta: + * @meta: parent #GstMeta + * @sequencehdr: the #GstMpegVideoSequenceHdr if present in the buffer + * @sequenceext: the #GstMpegVideoSequenceExt if present in the buffer + * @sequencedispext: the #GstMpegVideoSequenceDisplayExt if present in the + * buffer. + * @pichdr: the #GstMpegVideoPictureHdr if present in the buffer. + * @picext: the #GstMpegVideoPictureExt if present in the buffer. + * @quantext: the #GstMpegVideoQuantMatrixExt if present in the buffer + * + * Extra buffer metadata describing the contents of a MPEG1/2 Video frame + * + * Can be used by elements (mainly decoders) to avoid having to parse + * Mpeg video 1/2 packets if it can be done upstream. + * + * The various fields are only valid during the lifetime of the #GstH264Meta. + * If elements wish to use those for longer, they are required to make a copy. + */ +struct _GstMpegVideoMeta { + GstMeta meta; + + GstMpegVideoSequenceHdr *sequencehdr; + GstMpegVideoSequenceExt *sequenceext; + GstMpegVideoSequenceDisplayExt *sequencedispext; + GstMpegVideoPictureHdr *pichdr; + GstMpegVideoPictureExt *picext; + GstMpegVideoQuantMatrixExt *quantext; + + guint num_slices; + gsize slice_offset; +}; + + +#define gst_buffer_get_mpeg_video_meta(b) ((GstMpegVideoMeta*)gst_buffer_get_meta((b),GST_MPEG_VIDEO_META_API_TYPE)) + +GstMpegVideoMeta * +gst_buffer_add_mpeg_video_meta (GstBuffer * buffer, + const GstMpegVideoSequenceHdr *seq_hdr, + const GstMpegVideoSequenceExt *seq_ext, + const GstMpegVideoSequenceDisplayExt *disp_ext, + const GstMpegVideoPictureHdr *pic_hdr, + const GstMpegVideoPictureExt *pic_ext, + const GstMpegVideoQuantMatrixExt *quant_ext); + +G_END_DECLS + +#endif